Index: components/nacl.gyp |
diff --git a/components/nacl.gyp b/components/nacl.gyp |
index 9cf8d9276a12a9f05d5e3ffe598a30719c53f964..1942e220061b8d926c8c45bb12b65cb5715cb8ca 100644 |
--- a/components/nacl.gyp |
+++ b/components/nacl.gyp |
@@ -187,6 +187,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 th conflict with |
Nico
2014/03/26 15:54:04
s/ th / a /
|
+ # 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 |