diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:14:18 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:14:18 +0000 |
commit | 21d32ecf459324e55d24a84a4fc89d9166fa4fc8 (patch) | |
tree | c7319bb37d0d6c32335884b037ee243a05767e2b /build/gyp_chromium | |
parent | 658d2e8f2b0dc766cd91824bf28ae172c237c9f2 (diff) | |
download | chromium_src-21d32ecf459324e55d24a84a4fc89d9166fa4fc8.zip chromium_src-21d32ecf459324e55d24a84a4fc89d9166fa4fc8.tar.gz chromium_src-21d32ecf459324e55d24a84a4fc89d9166fa4fc8.tar.bz2 |
Win automatic toolchain: copy runtime dlls properly when not run from chrome/src.
gclient runhooks runs gyp_chromium from the chrome/ dir, but the script
was looking for out/ relative to that.
BUG=323300
Review URL: https://codereview.chromium.org/174063005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
-rwxr-xr-x | build/gyp_chromium | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 832ea37..b19e480 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -500,6 +500,7 @@ if __name__ == '__main__': [sys.executable, os.path.join(script_dir, 'landmines.py')]) if vs2013_runtime_dll_dirs: - CopyVsRuntimeDlls(GetOutputDirectory(), vs2013_runtime_dll_dirs) + CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), + vs2013_runtime_dll_dirs) sys.exit(gyp_rc) |