aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Bergeron <etienneb@google.com>2016-06-29 21:54:50 +0000
committerEtienne Bergeron <etienneb@google.com>2016-06-29 21:54:50 +0000
commit30ece958dbf3f5a97f0282da49b125e04657288d (patch)
treee873b83fea3c0dea87b22bc05047ea36fff4427a
parent07670b3e984db32f291373fe12c392959f2aff67 (diff)
downloadllvm-30ece958dbf3f5a97f0282da49b125e04657288d.zip
llvm-30ece958dbf3f5a97f0282da49b125e04657288d.tar.gz
llvm-30ece958dbf3f5a97f0282da49b125e04657288d.tar.bz2
[compiler-rt] Fix the Asan unittest on Windows
Summary: The build bot is broken because the runtime library doesn't have debug information. This is broken due to a recent change: http://reviews.llvm.org/D21554 Reviewers: rnk Subscribers: kubabrecka, llvm-commits, chrisha Differential Revision: http://reviews.llvm.org/D21862 llvm-svn: 274172
-rw-r--r--compiler-rt/lib/asan/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
index 2f16e29..489f5c2 100644
--- a/compiler-rt/lib/asan/CMakeLists.txt
+++ b/compiler-rt/lib/asan/CMakeLists.txt
@@ -63,7 +63,7 @@ append_list_if(WIN32 INTERCEPTION_DYNAMIC_CRT ASAN_DYNAMIC_DEFINITIONS)
set(ASAN_DYNAMIC_CFLAGS ${ASAN_CFLAGS})
append_list_if(COMPILER_RT_HAS_FTLS_MODEL_INITIAL_EXEC
-ftls-model=initial-exec ASAN_DYNAMIC_CFLAGS)
-append_list_if(MSVC /DEBUG ASAN_DYNAMIC_CFLAGS)
+append_list_if(MSVC /DEBUG ASAN_DYNAMIC_LINK_FLAGS)
append_list_if(COMPILER_RT_HAS_LIBC c ASAN_DYNAMIC_LIBS)
append_list_if(COMPILER_RT_HAS_LIBDL dl ASAN_DYNAMIC_LIBS)