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/nacl/nacl_fork_delegate_linux.cc | |
| 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/nacl/nacl_fork_delegate_linux.cc')
| -rw-r--r-- | chrome/nacl/nacl_fork_delegate_linux.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 1577975..828cb6e 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -46,7 +46,6 @@ void NaClForkDelegate::Init(const bool sandboxed, fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); ready_ = false; - return; // disabling nacl_helper for now FilePath helper_exe; FilePath helper_bootstrap_exe; if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && |