diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-05-21 19:32:43 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-05-21 19:32:43 +0000 |
| commit | 6d4a6ff7196268f1568af3d72a2681fb76d9e599 (patch) | |
| tree | d6027c7d5035c58af517b408dcb32713c18554be /cmake | |
| parent | da054b1bc17dd4b6607aa9c8d7e66ff4d77d1308 (diff) | |
Revert "[CMake] Reland "Make simple source used for CMake checks a C file""
This reverts commit rCRT332679 which doesn't quite work and will be
replaced by D47100 and D47115 which is a cleaner solution.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@332871 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/CompilerRTUtils.cmake | 4 | ||||
| -rw-r--r-- | cmake/config-ix.cmake | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake index 7ef1fc8d9..f567202fa 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake @@ -144,12 +144,8 @@ macro(test_target_arch arch def) endif() set(SAVED_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${argstring}") - if(SANITIZER_CXX_ABI_SYSTEM) - set(FLAG_LINK_LIBRARIES ${SANITIZER_CXX_ABI_LIBRARY}) - endif() try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE} COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS} ${FLAG_NO_EXCEPTIONS}" - LINK_LIBRARIES ${FLAG_LINK_LIBRARIES} OUTPUT_VARIABLE TARGET_${arch}_OUTPUT) set(CMAKE_EXE_LINKER_FLAGS ${SAVED_CMAKE_EXE_LINKER_FLAGS}) endif() diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 4a9d840b2..ee387dc22 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -125,7 +125,7 @@ set(COMPILER_RT_SUPPORTED_ARCH) # platform. We use the results of these tests to build only the various target # runtime libraries supported by our current compilers cross-compiling # abilities. -set(SIMPLE_SOURCE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/simple.c) +set(SIMPLE_SOURCE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/simple.cc) file(WRITE ${SIMPLE_SOURCE} "#include <stdlib.h>\n#include <stdio.h>\nint main() { printf(\"hello, world\"); }\n") # Detect whether the current target platform is 32-bit or 64-bit, and setup |