diff options
| author | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 00:38:58 +0000 |
|---|---|---|
| committer | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 00:38:58 +0000 |
| commit | cc239fd0d40bf199ac5332f4ee4180c87a4ce85e (patch) | |
| tree | 4f26322c2dec0ad6bde01b91e885da3861085a80 | |
| parent | ef5d1e845226eec2d6aee97c870594f0d635440b (diff) | |
| download | chromium_src-cc239fd0d40bf199ac5332f4ee4180c87a4ce85e.zip chromium_src-cc239fd0d40bf199ac5332f4ee4180c87a4ce85e.tar.gz chromium_src-cc239fd0d40bf199ac5332f4ee4180c87a4ce85e.tar.bz2 | |
Fix for build_sdk not using new NaCl arm newlib toolchain path.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3816
Review URL: https://codereview.chromium.org/236193012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263752 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 133476b..101daf4 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -229,9 +229,9 @@ def BuildStepUntarToolchains(pepperdir, toolchains): if 'arm' in toolchains: # Copy the existing arm toolchain from native_client tree tcname = platform + '_arm_newlib' - arm_toolchain = os.path.join(NACL_DIR, 'toolchain', tcname) - arm_toolchain_sdk = os.path.join(pepperdir, 'toolchain', - os.path.basename(arm_toolchain)) + arm_toolchain = os.path.join(NACL_DIR, 'toolchain', '%s_x86' % platform, + 'nacl_arm_newlib' ) + arm_toolchain_sdk = os.path.join(pepperdir, 'toolchain', tcname) buildbot_common.CopyDir(arm_toolchain, arm_toolchain_sdk) if 'glibc' in toolchains: |