[compiler-rt] r282033 - Revert "[CMake] Explicitly add --target option to compiler flags"
Chris Bieneman via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 20 15:29:22 PDT 2016
Author: cbieneman
Date: Tue Sep 20 17:29:22 2016
New Revision: 282033
URL: http://llvm.org/viewvc/llvm-project?rev=282033&view=rev
Log:
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
Modified:
compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake
Modified: compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake?rev=282033&r1=282032&r2=282033&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake Tue Sep 20 17:29:22 2016
@@ -227,18 +227,6 @@ macro(construct_compiler_rt_default_trip
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)
More information about the llvm-commits
mailing list