Index: chrome/nacl.gypi |
=================================================================== |
--- chrome/nacl.gypi (revision 232083) |
+++ chrome/nacl.gypi (working copy) |
@@ -24,6 +24,12 @@ |
'../sandbox/sandbox.gyp:libc_urandom_override', |
'../sandbox/sandbox.gyp:sandbox', |
], |
+ '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)', |
], |