Win/Clang: the ASan run-time DLL has moved

tools/clang/scripts/update.py

Index: tools/clang/scripts/update.py
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 041087f68731db3350a77e9b513718ee3f7de281..172f96989322aa1298524e0f8c9db2c2d4397a87 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$')

[Nico, 2014/12/04 20:31:56]

Won't this copy the old dll that's around from a previous build? Shouldn't the
logic be "if file doesn't exist in new place, copy it there?

[hans, 2014/12/04 20:33:06]

The copy below will overwrite any old file with a new one if it exists. I think
that's safe enough?

+
+  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, '..', '..'))