diff options
| -rw-r--r-- | build/win/asan.gyp | 2 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/build/win/asan.gyp b/build/win/asan.gyp index 9107db3..97fcb6f 100644 --- a/build/win/asan.gyp +++ b/build/win/asan.gyp @@ -19,7 +19,7 @@ 'destination': '<(PRODUCT_DIR)', 'files': [ # Path is relative to this GYP file. - '<(DEPTH)/<(make_clang_dir)/bin/clang_rt.asan_dynamic-i386.dll', + '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows/clang_rt.asan_dynamic-i386.dll', ], }, ], diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index 041087f..172f969 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -216,11 +216,6 @@ def UpdateClang(): '-DLLVM_ENABLE_ASSERTIONS=ON', LLVM_DIR]) RunCommand(GetVSVersion().SetupScript('x86') + ['&&', 'ninja', 'compiler-rt']) - asan_rt_bin_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'bin') - asan_rt_bin_dst_dir = os.path.join(LLVM_BUILD_DIR, 'bin') - CopyDirectoryContents(asan_rt_bin_src_dir, asan_rt_bin_dst_dir, - r'^.*-i386\.dll$') - # 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.6.0', 'lib', 'windows') @@ -229,6 +224,15 @@ def UpdateClang(): CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, r'^.*-i386\.lib$') + # TODO(hans): Remove when LLVM_WIN_REVISION is updated. + # Old versions of compiler-rt will leave the asan dll in bin/ + asan_rt_bin_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'bin') + CopyDirectoryContents(asan_rt_bin_src_dir, asan_rt_lib_dst_dir, + r'^.*-i386\.dll$') + + CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, + r'^.*-i386\.dll$') + CopyFile(os.path.join(asan_rt_lib_src_dir, '..', '..', 'asan_blacklist.txt'), os.path.join(asan_rt_lib_dst_dir, '..', '..')) |