diff options
| author | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 09:08:54 +0000 |
|---|---|---|
| committer | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 09:08:54 +0000 |
| commit | 69abdf0ed493f2a5f76de6dfe000a6ea0eedccf9 (patch) | |
| tree | 4779f76298ea32eec24476e02c6a3c0bf21b9e38 /native_client_sdk | |
| parent | 81ee3f12bb5c7afb64ccfce388ff4377868c5c0a (diff) | |
| download | chromium_src-69abdf0ed493f2a5f76de6dfe000a6ea0eedccf9.zip chromium_src-69abdf0ed493f2a5f76de6dfe000a6ea0eedccf9.tar.gz chromium_src-69abdf0ed493f2a5f76de6dfe000a6ea0eedccf9.tar.bz2 | |
Fix typo in nacl_dyncode.h path which prevented it from installing.
Install toolchain headers to glibc toolchain instead of newlib twice.
BUG=none
TEST=manual (build sdk, verify headers in place)
Review URL: http://codereview.chromium.org/9293021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index b3739a4..7f12ab3 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -181,7 +181,7 @@ header_map = { 'semaphore.h': 'src/untrusted/pthread/semaphore.h', 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h', 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h', - 'nacl_dyncode.h': ' src/untrusted/nacl/nacl_dyncode.h', + 'nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h', 'nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h', 'nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h', 'pnacl.h': 'src/untrusted/nacl/pnacl.h', @@ -191,7 +191,7 @@ header_map = { 'glibc': { 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h', 'dynamic_annotations.h': 'src/untrusted/valgrind/dynamic_annotations.h', - 'nacl_dyncode.h': ' src/untrusted/nacl/nacl_dyncode.h', + 'nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h', 'nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h', 'nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h', 'pnacl.h': 'src/untrusted/nacl/pnacl.h', @@ -303,7 +303,7 @@ def main(): # Then rename/move it to the pepper toolchain directory srcdir = os.path.join(tmpdir, 'sdk', 'nacl-sdk') newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib') - print "BUildbot mv %s to %s" % (srcdir, newlibdir) + print "Buildbot mv %s to %s" % (srcdir, newlibdir) MoveDir(srcdir, newlibdir) print "Done with buildbot move" # Untar the glibc toolchains @@ -335,7 +335,7 @@ def main(): InstallHeaders(GetToolchainNaClInclude(newlibdir, 'x86'), pepper_ver, 'newlib') - InstallHeaders(GetToolchainNaClInclude(newlibdir, 'x86'), + InstallHeaders(GetToolchainNaClInclude(glibcdir, 'x86'), pepper_ver, 'glibc') else: |