Skip to content

Commit

Permalink
Clang update script (Windows): fix asan runtime copying
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hans@chromium.org committed May 2, 2014
1 parent 5e49031 commit fd9ad77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
7 changes: 5 additions & 2 deletions tools/clang/scripts/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit fd9ad77

Please sign in to comment.