Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: build/common.gypi

Issue 10690103: Do not link non-executables with -pie for tsan=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 146962)
+++ build/common.gypi (working copy)
@@ -2296,35 +2296,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',
- ],
+ ],
+ }],
+ ],
}],
],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698