summaryrefslogtreecommitdiff
path: root/cmake/Modules/CompilerRTUtils.cmake
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2016-09-20 22:29:22 +0000
committerChris Bieneman <beanz@apple.com>2016-09-20 22:29:22 +0000
commit459808139c7498fe6a55a65e367d0eeebeec8f33 (patch)
treebdf164574c0689fcdb4c49db266ea025a0f7a281 /cmake/Modules/CompilerRTUtils.cmake
parent9a0a02984a9231b7340aaa02fbc46e42c1d31587 (diff)
Revert "[CMake] Explicitly add --target option to compiler flags"
This reverts commit r282024. This broke some bots, and I'm going to revert while I figure it out. See: http://lab.llvm.org:8011/builders/clang-x86_64-linux-abi-test/builds/21120 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282033 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/CompilerRTUtils.cmake')
-rw-r--r--cmake/Modules/CompilerRTUtils.cmake12
1 files changed, 0 insertions, 12 deletions
diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake
index e57a93e78..ba2a7bcfc 100644
--- a/cmake/Modules/CompilerRTUtils.cmake
+++ b/cmake/Modules/CompilerRTUtils.cmake
@@ -227,18 +227,6 @@ macro(construct_compiler_rt_default_triple)
set(COMPILER_RT_DEFAULT_TARGET_TRIPLE ${COMPILER_RT_TEST_TARGET_TRIPLE})
endif()
- if(NOT APPLE)
- # Much of the non-darwin compiler-rt build assumes that
- # COMPILER_RT_DEFAULT_TARGET_TRIPLE is the default target of the compiler
- # being used. That isn't always a safe assumption, but adding this here
- # makes it all work.
- # This doesn't prevent needing to set CMAKE_<LANG>_COMPILER_TARGET in some
- # situations, so YMMV.
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --target=${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --target=${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")
- set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --target=${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")
- endif()
-
string(REPLACE "-" ";" TARGET_TRIPLE_LIST ${COMPILER_RT_DEFAULT_TARGET_TRIPLE})
list(GET TARGET_TRIPLE_LIST 0 COMPILER_RT_DEFAULT_TARGET_ARCH)
list(GET TARGET_TRIPLE_LIST 1 COMPILER_RT_DEFAULT_TARGET_OS)