diff options
| author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 20:05:02 +0000 |
|---|---|---|
| committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 20:05:02 +0000 |
| commit | 6a3d763fc616dcc0775d5eebf75b9de892e24546 (patch) | |
| tree | 4149d38ca32465531075a034b4d0dbd5b519b6f9 /chrome | |
| parent | 56d82c9cc1ac26ded882c9b46694a8ea5142fdf5 (diff) | |
| download | chromium_src-6a3d763fc616dcc0775d5eebf75b9de892e24546.zip chromium_src-6a3d763fc616dcc0775d5eebf75b9de892e24546.tar.gz chromium_src-6a3d763fc616dcc0775d5eebf75b9de892e24546.tar.bz2 | |
Fix NaCl build error with ninja.
Fix source-tree paths passed to compiler and linker flags of nacl_helper_bootstrap so that they are correct when building with ninja.
BUG=None
TEST=Manual: nacl_helper_bootstrap target should build both with make and ninja.
Review URL: http://codereview.chromium.org/7828095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/nacl.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 42c0035..000c5dc 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 |