diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-09-20 22:29:22 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-09-20 22:29:22 +0000 |
| commit | 177ccc554bdb683e1d31a0a16c2746b8e41c6756 (patch) | |
| tree | 6307effffef0f6eb9f59348afa3e99a18a214cc1 | |
| parent | d4487347e3fd1e274ad08e480d0991e10c75387d (diff) | |
| download | bcm5719-llvm-177ccc554bdb683e1d31a0a16c2746b8e41c6756.tar.gz bcm5719-llvm-177ccc554bdb683e1d31a0a16c2746b8e41c6756.zip | |
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
llvm-svn: 282033
| -rw-r--r-- | compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index e57a93e7835..ba2a7bcfcd2 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/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) |
