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 |