diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 17:58:19 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 17:58:19 +0000 |
| commit | 3d8a5f2479cccc683ccd7524c1225fb3630f17d4 (patch) | |
| tree | f4277b3f20d5d5180043b9be30bcd439dc3d3e85 /build/gyp_chromium | |
| parent | 4446260006b4f902c1d198c6e17c12ce219fba81 (diff) | |
| download | chromium_src-3d8a5f2479cccc683ccd7524c1225fb3630f17d4.zip chromium_src-3d8a5f2479cccc683ccd7524c1225fb3630f17d4.tar.gz chromium_src-3d8a5f2479cccc683ccd7524c1225fb3630f17d4.tar.bz2 | |
Amend PATH for nacl64 so loader can find x64 CRT
In order to keep from needing to system-install VS runtime DLLs
for debug builds, we put them in the output directory. This
mostly works, except in the case of nacl64 it requires the x64
CRT, but builds into the x86 output directory. The OS loader will
ignore the x86 ones, and continue searching the PATH, so before
launching nacl64.exe, append to PATH to the location of the x64
CRT DLLs.
See linked bug for more details and investigation.
R=cpu@chromium.org, mseaborn@chromium.org
BUG=346034
Review URL: https://codereview.chromium.org/180223004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index ec400e1..4b1cfe0 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -375,13 +375,22 @@ def CopyVsRuntimeDlls(output_dir, runtime_dirs): x86, x64 = runtime_dirs out_debug = os.path.join(output_dir, 'Debug') + out_debug_nacl64 = os.path.join(output_dir, 'Debug', 'x64') out_release = os.path.join(output_dir, 'Release') + out_release_nacl64 = os.path.join(output_dir, 'Release', 'x64') out_debug_x64 = os.path.join(output_dir, 'Debug_x64') out_release_x64 = os.path.join(output_dir, 'Release_x64') - copy_runtime(out_debug, x86, 'msvc%s120d.dll') - copy_runtime(out_release, x86, 'msvc%s120.dll') - copy_runtime(out_debug_x64, x64, 'msvc%s120d.dll') - copy_runtime(out_release_x64, x64, 'msvc%s120.dll') + + if os.path.exists(out_debug) and not os.path.exists(out_debug_nacl64): + os.makedirs(out_debug_nacl64) + if os.path.exists(out_release) and not os.path.exists(out_release_nacl64): + os.makedirs(out_release_nacl64) + copy_runtime(out_debug, x86, 'msvc%s120d.dll') + copy_runtime(out_release, x86, 'msvc%s120.dll') + copy_runtime(out_debug_x64, x64, 'msvc%s120d.dll') + copy_runtime(out_release_x64, x64, 'msvc%s120.dll') + copy_runtime(out_debug_nacl64, x64, 'msvc%s120d.dll') + copy_runtime(out_release_nacl64, x64, 'msvc%s120.dll') if __name__ == '__main__': |