From 9ddb68283018679bcadbce2f4e2e7171883069da Mon Sep 17 00:00:00 2001 From: "bradchen@google.com" Date: Wed, 7 Sep 2011 22:03:33 +0000 Subject: 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 --- chrome/chrome_exe.gypi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'chrome/chrome_exe.gypi') 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 -- cgit v1.1