summaryrefslogtreecommitdiff
path: root/runtimes
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2018-07-13 20:01:55 +0000
committerPetr Hosek <phosek@chromium.org>2018-07-13 20:01:55 +0000
commitb4c1bb4999a25ca5254a007d3a40a0003fbd5db8 (patch)
tree000e57417ed6f51c6ea1b9ed75d5bde7e36bc83c /runtimes
parent7dc602e516439662899798930dbafe3cfac52774 (diff)
Revert "[CMake] Pass Clang defaults to runtimes builds"
This reverts commit r332923 which is no longer needed since its use has been reverted in r337033. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@337039 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtimes')
-rw-r--r--runtimes/CMakeLists.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt
index d14a08ebace..42842409dca 100644
--- a/runtimes/CMakeLists.txt
+++ b/runtimes/CMakeLists.txt
@@ -227,7 +227,6 @@ else() # if this is included from LLVM's CMake
-DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES COMPILER_RT
- CLANG_DEFAULT
USE_TOOLCHAIN
${EXTRA_ARGS})
endfunction()
@@ -261,7 +260,6 @@ else() # if this is included from LLVM's CMake
-DCMAKE_ASM_COMPILER_WORKS=ON
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
${${target}_extra_args}
- PASSTHROUGH_PREFIXES CLANG_DEFAULT
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip
USE_TOOLCHAIN
${EXTRA_ARGS})
@@ -357,7 +355,6 @@ else() # if this is included from LLVM's CMake
-DCMAKE_CXX_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
- CLANG_DEFAULT
${ARG_PREFIXES}
EXTRA_TARGETS ${extra_targets}
${test_targets}
@@ -446,7 +443,6 @@ else() # if this is included from LLVM's CMake
-DLLVM_RUNTIMES_TARGET=${name}
${${name}_extra_args}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
- CLANG_DEFAULT
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip
EXTRA_TARGETS ${${name}_extra_targets}
${${name}_test_targets}