diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 21:33:35 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 21:33:35 +0000 |
| commit | 56cca4ef17fedda156e02a0840785eb874108f08 (patch) | |
| tree | 3c4b99b137afeff8765f712f587eb11f894cc1f2 /build | |
| parent | ec1f0fcc731f732b88a5dd2d9dcc92bd1ed8e145 (diff) | |
| download | chromium_src-56cca4ef17fedda156e02a0840785eb874108f08.zip chromium_src-56cca4ef17fedda156e02a0840785eb874108f08.tar.gz chromium_src-56cca4ef17fedda156e02a0840785eb874108f08.tar.bz2 | |
Don't use -fstack-protector-all in Valgrind configurations.
r91301 was not intended to be used in Valgrind configurations, but the GYP
variable controlling Valgrind builds is named release_valgrind_build, which
makes it seem like the Valgrind builders use the Release configuration. r91301
was only effective in Debug mode. Who would have guessed that the Valgrind
builders actually use the Release configuration, and a separate check for
release_valgrind_build is needed to keep them from using
-fstack-protector-all.
BUG=88238
TEST=none
Review URL: http://codereview.chromium.org/7302010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 768d9bc..5f44362 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -976,7 +976,6 @@ 'COPY_PHASE_STRIP': 'NO', 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', 'OTHER_CFLAGS': [ - '-fstack-protector-all', # Implies -fstack-protector '<@(debug_extra_cflags)', ], }, @@ -1015,6 +1014,13 @@ '<@(debug_extra_cflags)', ], }], + ['release_valgrind_build==0', { + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-fstack-protector-all', # Implies -fstack-protector + ], + }, + }], ], }, 'Release_Base': { |