summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2014-10-29 19:25:20 +0000
committerAaron Ballman <aaron@aaronballman.com>2014-10-29 19:25:20 +0000
commit208eae32d1c92404668732216d429331c1aa6950 (patch)
tree3a589b005d038e053dd30604a323ec29599776fe /cmake
parent628cc10c5bab3eba1e34c6feefc1aef94818c3ad (diff)
Reverting r220517; it seems this broke check-asan.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220869 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/AddCompilerRT.cmake8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
index 95eacd0b9..aafccd47d 100644
--- a/cmake/Modules/AddCompilerRT.cmake
+++ b/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.