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

Unified Diff: components/nacl.gyp

Issue 357623003: Move default sanitizer options into build/ so that WebRTC can import them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « build/sanitizers/tsan_suppressions.cc ('k') | 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 0bba251562af013f75fa1973594a2d334695abe6..500d597ba326036ec6c216b936afc9894775f551 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -245,8 +245,8 @@
'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.
+ # build/sanitizers/sanitizer_options.cc to avoid a conflict with
+ # those in nacl/nacl_helper_linux.cc.
'-Wl,-u_sanitizer_options_link_helper',
],
'link_settings': {
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698