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

Unified Diff: components/nacl.gyp

Issue 240783003: move ldflags for nacl_helper_linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@seccomp-review4
Patch Set: Created 6 years, 8 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 | « no previous file | 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 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698