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

Unified Diff: chrome/nacl.gypi

Issue 7828095: Fix NaCl build error with ninja. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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: chrome/nacl.gypi
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 42c0035bca71340879ddf62d693453a9cb33d077..000c5dc7f6513561badbd70c31f700893a31cf88 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -268,7 +268,7 @@
# TODO(bradchen): Delete the -B argument when Gold is verified
# to produce good results with our custom linker script.
# Until then use ld.bfd.
- '-B', 'tools/ld_bfd',
+ '-B', '<(PRODUCT_DIR)/../../tools/ld_bfd',
# This programs is (almost) entirely standalone. It has
# its own startup code, so no crt1.o for it. It is
# statically linked, and on x86 it actually does not use
@@ -276,8 +276,7 @@
# things from libc, so we don't use '-nostdlib' here.
'-static', '-nostartfiles',
# Link with our custom linker script to get out special layout.
- # TODO(bradnelson): Use some <(foo) instead of chrome/ here.
- '-Wl,--script=chrome/nacl/nacl_helper_bootstrap_linux.x',
+ '-Wl,--script=<(PRODUCT_DIR)/../../chrome/nacl/nacl_helper_bootstrap_linux.x',
# On x86-64, the default page size with some
# linkers is 2M rather than the real Linux page
# size of 4K. A larger page size is incompatible
« 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