diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 20:06:45 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 20:06:45 +0000 |
| commit | cb770a4c7224dba6945b04809a65e7081515991b (patch) | |
| tree | 1dcf7441605b042e161046553039adf6ed5bec64 /build/common.gypi | |
| parent | ebac6c663c69bff96243272a3e972ce040aab9dd (diff) | |
| download | chromium_src-cb770a4c7224dba6945b04809a65e7081515991b.zip chromium_src-cb770a4c7224dba6945b04809a65e7081515991b.tar.gz chromium_src-cb770a4c7224dba6945b04809a65e7081515991b.tar.bz2 | |
Do not link non-executables with -pie for tsan=1
(-pie is incompatible with -shared and -static)
Review URL: https://chromiumcodereview.appspot.com/10690103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/build/common.gypi b/build/common.gypi index b3093e9..5b38b23 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2324,35 +2324,41 @@ ['asan==1', { 'target_conditions': [ ['_toolset=="target"', { - 'cflags': [ - '-faddress-sanitizer', - '-fno-omit-frame-pointer', - ], - 'ldflags': [ - '-faddress-sanitizer', - ], - 'defines': [ - 'ADDRESS_SANITIZER', - ], + 'cflags': [ + '-faddress-sanitizer', + '-fno-omit-frame-pointer', + ], + 'ldflags': [ + '-faddress-sanitizer', + ], + 'defines': [ + 'ADDRESS_SANITIZER', + ], }], ], }], ['tsan==1', { 'target_conditions': [ ['_toolset=="target"', { - 'cflags': [ - '-fthread-sanitizer', - '-fno-omit-frame-pointer', - '-fPIE', - ], - 'ldflags': [ - '-fthread-sanitizer', + 'cflags': [ + '-fthread-sanitizer', + '-fno-omit-frame-pointer', + '-fPIE', + ], + 'ldflags': [ + '-fthread-sanitizer', + ], + 'defines': [ + 'THREAD_SANITIZER', + 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', + ], + 'target_conditions': [ + ['_type=="executable"', { + 'ldflags': [ '-pie', - ], - 'defines': [ - 'THREAD_SANITIZER', - 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', - ], + ], + }], + ], }], ], }], |