summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2014-10-23 21:58:36 +0000
committerAaron Ballman <aaron@aaronballman.com>2014-10-23 21:58:36 +0000
commit5f1fdd7d90d3e9322c8b3864a0028b5925e3282e (patch)
tree7a79c2e47f1be35addd0d700012489e5f16d67d3
parent5175bcf43aecf18daf380ecc2a11d1a067eb693e (diff)
downloadbcm5719-llvm-5f1fdd7d90d3e9322c8b3864a0028b5925e3282e.tar.gz
bcm5719-llvm-5f1fdd7d90d3e9322c8b3864a0028b5925e3282e.zip
Do not set linker flags for MSVC; they are not the same thing as compiler flags. Note, this is already done in the add_compiler_rt_test test_suite function.
llvm-svn: 220517
-rw-r--r--compiler-rt/cmake/Modules/AddCompilerRT.cmake8
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index aafccd47ddc..95eacd0b9bb 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -52,8 +52,12 @@ macro(add_compiler_rt_runtime name arch type)
# Setup compile flags and definitions.
set_target_compile_flags(${name}
${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
- set_target_link_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_property(TARGET ${name} APPEND PROPERTY
COMPILE_DEFINITIONS ${LIB_DEFS})
# Setup correct output directory in the build tree.
OpenPOWER on IntegriCloud