diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 22:43:18 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 22:43:18 +0000 |
| commit | db2cf5387f3e66944ff9205dccb4476ba5b14ad7 (patch) | |
| tree | 140f810b84a60c5baca135eb25452688c7819b93 /native_client_sdk | |
| parent | 89a8b949fce1582f0dac38c751d9493f14f59d22 (diff) | |
| download | chromium_src-db2cf5387f3e66944ff9205dccb4476ba5b14ad7.zip chromium_src-db2cf5387f3e66944ff9205dccb4476ba5b14ad7.tar.gz chromium_src-db2cf5387f3e66944ff9205dccb4476ba5b14ad7.tar.bz2 | |
[NaCl SDK] On windows, libpnacl_irt_shim.a is built into src/build, not src/out.
BUG=none
TBR=jvoung@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10946039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 5c58610..12348df 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -390,9 +390,17 @@ def BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains): buildbot_common.Run( GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '64'), cwd=NACL_DIR, shell=(platform=='win')) + # Fill in the latest native pnacl shim library from the chrome build. + if platform == 'win': + # The windows nacl buildbots still use devenv to build, which uses + # 'src/build' as its output directory. + release_build_dir = os.path.join(SRC_DIR, 'build', 'Release') + else: + release_build_dir = os.path.join(OUT_DIR, 'Release') + buildbot_common.CopyFile( - os.path.join(OUT_DIR, 'Release', 'libpnacl_irt_shim.a'), + os.path.join(release_build_dir, 'libpnacl_irt_shim.a'), GetPNaClNativeLib(pnacldir, 'x86-64')) InstallHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'), pepper_ver, |