Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 5e41fce43d127a090ac9faefe55cafd8403cd818..9399c5d17afc3e1653eb003a77500c67e06ea284 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -5505,7 +5505,18 @@ |
}, |
}, |
], |
- ['optimize=="max"', { |
+ ['optimize=="max" and clang==1', { |
+ # Like "max" below, but without WholeProgramOptimization. |
+ # TODO(hans): Remove when Clang rolls past r239656. |
+ 'msvs_settings': { |
+ 'VCCLCompilerTool': { |
+ 'Optimization': '2', |
+ 'FavorSizeOrSpeed': '1', |
+ }, |
+ }, |
+ }, |
+ ], |
+ ['optimize=="max" and clang==0', { |
# Disable Warning 4702 ("Unreachable code") for the WPO/PGO |
# builds. Probably anything that this would catch that |
# wouldn't be caught in a normal build isn't going to |