diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 22:03:33 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 22:03:33 +0000 |
| commit | 9ddb68283018679bcadbce2f4e2e7171883069da (patch) | |
| tree | 6f975a38ffb4b24c7663dab47f975e5affe66ceb /chrome/chrome_exe.gypi | |
| parent | 1b62f9017e442d98474e0fc46bc40d31f4704167 (diff) | |
| download | chromium_src-9ddb68283018679bcadbce2f4e2e7171883069da.zip chromium_src-9ddb68283018679bcadbce2f4e2e7171883069da.tar.gz chromium_src-9ddb68283018679bcadbce2f4e2e7171883069da.tar.bz2 | |
Modify the build recipe for nacl_helper_bootstrap to invoke the linker explicitly via an action rather than invoking via g++. This addresses build problems that occurred on certain developer machines.
Also, modified tools/ld_bfd/ld script to find the loader within the Chrome OS build chroot.
Also re-enable the nacl_helper.
BUG=92964,nativeclient:480
TEST=nacl_integration tests on bots
Review URL: http://codereview.chromium.org/7841008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index c8a9175..74445a8 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -452,6 +452,17 @@ '../third_party/adobe/flash/flash_player.gyp:flash_player', ], }], + ['OS=="linux"', { + 'conditions': [ + # For now, do not build nacl_helper on ARM or when disable_nacl=1 + ['disable_nacl!=1 and target_arch!="arm"', { + 'dependencies': [ + 'nacl_helper_bootstrap', + 'nacl_helper', + ], + }], + ], + }], ['OS=="mac"', { 'dependencies': [ # On Mac, make sure we've built chrome_dll, which contains all of |