diff options
| author | Greg Fitzgerald <gregf@codeaurora.org> | 2014-03-27 01:11:12 +0000 |
|---|---|---|
| committer | Greg Fitzgerald <gregf@codeaurora.org> | 2014-03-27 01:11:12 +0000 |
| commit | b1873d9889075211e47e614f85fc0238e38c6ce2 (patch) | |
| tree | ec9711703b4db231ad00ca485b49ce00f37693d0 /CMakeLists.txt | |
| parent | 9d91c5f025fb8a85f20982ed246f74251ba4b45f (diff) | |
| download | compiler-rt-b1873d9889075211e47e614f85fc0238e38c6ce2.tar.gz | |
Revert r204877 "Allow the user to override the compiler used for testing"
Unbreak the sanitizer-x86_64-linux bot.
Change-Id: Ie03f1b93fae45c54b142003731ff4f5d4f6b62f8
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204886 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aee1a032d..dbc32f112 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD) ${LLVM_ENABLE_WERROR}) # Use just-built Clang to compile/link tests. set(COMPILER_RT_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) + set(COMPILER_RT_TEST_COMPILER_ID Clang) else() # Take output dir and install path from the user. set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH @@ -70,7 +71,8 @@ else() option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) # Use a host compiler to compile/link tests. - option(COMPILER_RT_TEST_COMPILER "Compiler to use for testing" ${CMAKE_C_COMPILER}) + set(COMPILER_RT_TEST_COMPILER ${CMAKE_C_COMPILER}) + set(COMPILER_RT_TEST_COMPILER_ID ${CMAKE_C_COMPILER_ID}) if (NOT LLVM_CONFIG_PATH) find_program(LLVM_CONFIG_PATH "llvm-config" @@ -118,12 +120,6 @@ else() set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit") endif() -if("${COMPILER_RT_TEST_COMPILER}" MATCHES "clang[+]*$") - set(COMPILER_RT_TEST_COMPILER_ID Clang) -else() - set(COMPILER_RT_TEST_COMPILER_ID GNU) -endif() - string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) set(COMPILER_RT_LIBRARY_OUTPUT_DIR ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) |