diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:47:19 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:47:19 +0000 |
| commit | fd9ad772d04867f151558bacaa164dcf0ad9dead (patch) | |
| tree | ec685aa8cb222b9c04caa2b473905e15cf77c5eb | |
| parent | 5e49031da027a8fcde0cde69155d306c0e2fed4d (diff) | |
| download | chromium_src-fd9ad772d04867f151558bacaa164dcf0ad9dead.zip chromium_src-fd9ad772d04867f151558bacaa164dcf0ad9dead.tar.gz chromium_src-fd9ad772d04867f151558bacaa164dcf0ad9dead.tar.bz2 | |
Clang update script (Windows): fix asan runtime copying
Fix the copying of asan runtime. I'll try to come up with a more permanent
solution, but this should get the ASan buildbot going in the meantime.
BUG=82385
NOTRY=true
Review URL: https://codereview.chromium.org/263003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267932 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 176fdaa..1c83133 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5058,7 +5058,7 @@ 'VCLinkerTool': { 'AdditionalLibraryDirectories': [ # TODO(hans): If make_clang_dir is absolute, this breaks. - '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5/lib/windows', + '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/lib/windows', ], }, 'target_conditions': [ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index 45a3408..a57bd0d 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -139,10 +139,13 @@ def UpdateClang(): ['&&', 'cmake', '-GNinja', '-DCMAKE_BUILD_TYPE=Release', '-DLLVM_ENABLE_ASSERTIONS=ON', LLVM_DIR]) RunCommand(GetVSVersion().SetupScript('x86') + ['&&', 'ninja', 'compiler-rt']) + + # TODO(hans): Make this (and the .gypi file) version number independent. asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', - '3.5', 'lib', 'windows') + '3.5.0', 'lib', 'windows') asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', - '3.5', 'lib', 'windows') + '3.5.0', 'lib', 'windows') + if not os.path.exists(asan_rt_lib_dst_dir): os.makedirs(asan_rt_lib_dst_dir) for root, _, files in os.walk(asan_rt_lib_src_dir): |