[compiler-rt] r220869 - Reverting r220517; it seems this broke check-asan.

Aaron Ballman aaron at aaronballman.com
Wed Oct 29 12:25:20 PDT 2014


Author: aaronballman
Date: Wed Oct 29 14:25:20 2014
New Revision: 220869

URL: http://llvm.org/viewvc/llvm-project?rev=220869&view=rev
Log:
Reverting r220517; it seems this broke check-asan.

Modified:
    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=220869&r1=220868&r2=220869&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Wed Oct 29 14:25:20 2014
@@ -52,12 +52,8 @@ macro(add_compiler_rt_runtime name arch
     # 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.





More information about the llvm-commits mailing list