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

Unified Diff: components/nacl.gyp

Issue 238123003: Set the default ASan options for executables built with ASan on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 028b8c629b4d30b6463aa134ca6351e1b24c2c4e..99d89f0a0e7c9bd36e0c71f52ebec8cfb35b4b4f 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -190,6 +190,12 @@
'../sandbox/sandbox.gyp:sandbox',
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
],
+ 'ldflags!': [
+ # Do not pick the default ASan options from
+ # base/debug/sanitizer_options.cc to avoid a conflict with those
+ # in nacl/nacl_helper_linux.cc.
+ '-Wl,-u_sanitizer_options_link_helper',
+ ],
'defines': [
'<@(nacl_defines)',
# Allow .cc files to know if they're being compiled as part
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698