summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 00:43:53 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 00:43:53 +0000
commit16d71b0d8a772c8942be721f555081cead91f831 (patch)
treefebbb809fa7b92532cdcfacbe817b831ba4c3d97 /build
parentd36ccf511ffb7b57f004acf56f87c318602502a5 (diff)
downloadchromium_src-16d71b0d8a772c8942be721f555081cead91f831.zip
chromium_src-16d71b0d8a772c8942be721f555081cead91f831.tar.gz
chromium_src-16d71b0d8a772c8942be721f555081cead91f831.tar.bz2
Trying to make the -pie stick for x64 on the main waterfall...
TBR=jeffbailey Review URL: http://codereview.chromium.org/7206052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 0065483..65e6a65 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1196,11 +1196,15 @@
# At gyp time, we test the linker for ICF support; this flag
# is then provided to us by gyp. (Currently only gold supports
# an --icf flag.)
+ # There seems to be a conflict of --icf and -pie in gold which
+ # can generate crashy binaries. As a security measure, -pie
+ # takes precendence for now.
['LINKER_SUPPORTS_ICF==1 and release_valgrind_build==0', {
'target_conditions': [
['_toolset=="target"', {
'ldflags': [
- '-Wl,--icf=safe',
+ #'-Wl,--icf=safe',
+ '-Wl,--icf=none',
]
}]
]