diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 21:04:32 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 21:04:32 +0000 |
| commit | 3776444b9040fb267a6127ff4ff6fe68c365af19 (patch) | |
| tree | 389c9357b58ca49ce0b69d0012304011532ba9a0 /build/internal | |
| parent | df02acac84b909c194541c93eb25a3933b2b60cf (diff) | |
| download | chromium_src-3776444b9040fb267a6127ff4ff6fe68c365af19.zip chromium_src-3776444b9040fb267a6127ff4ff6fe68c365af19.tar.gz chromium_src-3776444b9040fb267a6127ff4ff6fe68c365af19.tar.bz2 | |
Disable fpo one more time, this time for non-official (canary) builds.
Review URL: https://chromiumcodereview.appspot.com/9373036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/internal')
| -rw-r--r-- | build/internal/release_impl.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build/internal/release_impl.gypi b/build/internal/release_impl.gypi index 2e95aee..5ac0e09 100644 --- a/build/internal/release_impl.gypi +++ b/build/internal/release_impl.gypi @@ -3,4 +3,15 @@ # found in the LICENSE file. { 'includes': ['release_defaults.gypi'], + 'msvs_settings': { + 'VCCLCompilerTool': { + '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-'], + }, + }, } |