Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index bb3726c6c50d49eea1a133c94535b8638d393be8..9c9fdd5dc86fb9aecdf91bdc3e84c0dd13a96579 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1493,6 +1493,12 @@ |
}], |
['win_release_OmitFramePointers==0', { |
'OmitFramePointers': 'false', |
+ # 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-'], |
}], |
], |
}, |