From 737370da2087fcbcb3402a42eba6dc482f2f57b3 Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Thu, 28 Aug 2014 12:28:04 +0000 Subject: [PATCH] [ASan/Win] Add the -Zl flag to avoid /DEFAULTLIB:libcmt directive in the asan_win_uar_thunk object file This directive results in 'symbol already defined' when linking DLLs that use -MD llvm-svn: 216663 --- compiler-rt/lib/asan/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index aed258250ad8..1c0c880b4b2b 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -195,7 +195,7 @@ else() add_dependencies(asan clang_rt.asan_dll_thunk-${arch}) add_compiler_rt_runtime(clang_rt.asan_uar_thunk-${arch} ${arch} STATIC SOURCES asan_win_uar_thunk.cc - CFLAGS ${ASAN_CFLAGS} -DASAN_UAR_THUNK + CFLAGS ${ASAN_CFLAGS} -DASAN_UAR_THUNK -Zl DEFS ${ASAN_COMMON_DEFINITIONS}) add_dependencies(asan clang_rt.asan_uar_thunk-${arch}) endif()