Index: build/internal/release_impl_official.gypi |
=================================================================== |
--- build/internal/release_impl_official.gypi (revision 121081) |
+++ build/internal/release_impl_official.gypi (working copy) |
@@ -8,8 +8,14 @@ |
'VCCLCompilerTool': { |
'InlineFunctionExpansion': '2', |
'EnableIntrinsicFunctions': 'true', |
+ 'EnableFiberSafeOptimizations': 'true', |
'OmitFramePointers': 'false', |
- 'EnableFiberSafeOptimizations': 'true', |
+ # The above is not sufficient (http://crbug.com/106711): it |
+ # simply eliminates an explicit "/Oy", but both /O2 and /Ox |
+ # perform FPO regardless, so we must explicitly disable. |
+ # We still want the false setting above to avoid having |
+ # "/Oy /Oy-" and warnings about overriding. |
+ 'AdditionalOptions': ['/Oy-'], |
}, |
'VCLibrarianTool': { |
'AdditionalOptions': [ |