| Index: components/nacl.gyp
|
| diff --git a/components/nacl.gyp b/components/nacl.gyp
|
| index fe95adfefa69615c3e554b93856ba601453bdd7f..c657034afc05aa4719bb8bbc5d5ed751ef64cb02 100644
|
| --- a/components/nacl.gyp
|
| +++ b/components/nacl.gyp
|
| @@ -197,6 +197,12 @@
|
| 'nacl_loader',
|
| ],
|
| 'cflags': ['-fPIE'],
|
| + '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',
|
| + ],
|
| 'link_settings': {
|
| 'ldflags': ['-pie'],
|
| },
|
| @@ -206,12 +212,6 @@
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| - '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
|
|
|