From d98e197386cca8585acd7189ec0460b3e0eed0f6 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Wed, 29 Oct 2014 19:25:20 +0000
Subject: [PATCH] Reverting r220517; it seems this broke check-asan.

llvm-svn: 220869
---
 compiler-rt/cmake/Modules/AddCompilerRT.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 95eacd0b9bb1..aafccd47ddc8 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -52,12 +52,8 @@ macro(add_compiler_rt_runtime name arch type)
     # Setup compile flags and definitions.
     set_target_compile_flags(${name}
       ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
-    if (NOT MSVC)
-      # We do not want any custom link flags set on MSVC; especially not the
-      # compiler flags, as with other compilers.
-      set_target_link_flags(${name}
-        ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
-    endif()
+    set_target_link_flags(${name}
+      ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
     set_property(TARGET ${name} APPEND PROPERTY
       COMPILE_DEFINITIONS ${LIB_DEFS})
     # Setup correct output directory in the build tree.