Skip to content

GitLab

T
tangled
Commit cb770a4c authored by glider@chromium.org's avatar glider@chromium.org
Browse files
Options

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
parent ebac6c66
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
build/common.gypi
View file @ cb770a4c
...@@ -2324,35 +2324,41 @@ ...@@ -2324,35 +2324,41 @@
['asan==1', { ['asan==1', {
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'cflags': [ 'cflags': [
'-faddress-sanitizer', '-faddress-sanitizer',
'-fno-omit-frame-pointer', '-fno-omit-frame-pointer',
], ],
'ldflags': [ 'ldflags': [
'-faddress-sanitizer', '-faddress-sanitizer',
], ],
'defines': [ 'defines': [
'ADDRESS_SANITIZER', 'ADDRESS_SANITIZER',
], ],
}], }],
], ],
}], }],
['tsan==1', { ['tsan==1', {
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'cflags': [ 'cflags': [
'-fthread-sanitizer', '-fthread-sanitizer',
'-fno-omit-frame-pointer', '-fno-omit-frame-pointer',
'-fPIE', '-fPIE',
], ],
'ldflags': [ 'ldflags': [
'-fthread-sanitizer', '-fthread-sanitizer',
],
'defines': [
'THREAD_SANITIZER',
'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1',
],
'target_conditions': [
['_type=="executable"', {
'ldflags': [
'-pie', '-pie',
], ],
'defines': [ }],
'THREAD_SANITIZER', ],
'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1',
],
}], }],
], ],
}], }],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment