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

Unified Diff: components/nacl.gyp

Issue 212793010: Revert of 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, 9 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 | « chrome/app/chrome_exe_main_gtk.cc ('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 1942e220061b8d926c8c45bb12b65cb5715cb8ca..9cf8d9276a12a9f05d5e3ffe598a30719c53f964 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -187,12 +187,6 @@
'../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 th 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 | « chrome/app/chrome_exe_main_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698