Commit cb770a4c authored by glider@chromium.org's avatar glider@chromium.org

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
......@@ -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',
],
],
}],
],
}],
],
}],
......
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