Index: build/config/win/BUILD.gn |
diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn |
index db3cdca704f6143a9d47d2481342cc7e4f6fdd8b..f48b4640dc4093c308c8e0335b137bc081609136 100644 |
--- a/build/config/win/BUILD.gn |
+++ b/build/config/win/BUILD.gn |
@@ -299,7 +299,12 @@ config("windowed") { |
incremental_linking_on_switch = [ "/INCREMENTAL" ] |
incremental_linking_off_switch = [ "/INCREMENTAL:NO" ] |
-if (is_debug) { |
+ |
+# MSVC2015's incremental linker complains about clang's .obj files sometimes, |
+# https://crbug.com/595702. Disable incremental linking with clang for now. |
+# TODO(thakis): Remove this once that problem is fixed, or when the win_clang |
+# bot uses lld. |
+if (is_debug && !is_clang) { |
default_incremental_linking_switch = incremental_linking_on_switch |
} else { |
default_incremental_linking_switch = incremental_linking_off_switch |