aboutsummaryrefslogtreecommitdiff
path: root/llvm/runtimes
diff options
context:
space:
mode:
authorPetr Hosek <phosek@google.com>2022-05-18 17:00:18 +0000
committerPetr Hosek <phosek@google.com>2022-05-18 17:02:02 +0000
commitececce1b5ec1a83434568591e4c18ac79e4f3631 (patch)
treeb7f5edda62e099a28be5b249b2198fd92b422378 /llvm/runtimes
parenteafa0530417e09755b94d0e94afc0f792b98c80d (diff)
downloadllvm-ececce1b5ec1a83434568591e4c18ac79e4f3631.zip
llvm-ececce1b5ec1a83434568591e4c18ac79e4f3631.tar.gz
llvm-ececce1b5ec1a83434568591e4c18ac79e4f3631.tar.bz2
Partially revert "[CMake] Passthrough OSX CMake options to builtins and runtimes"
This partially reverts commit 9cddfe3085c4c500e64350b56c37ae2ed1cbe3f6, specifically passthrough for CMAKE_OSX_* since this can lead to build passing through internal variables when it's not intended.
Diffstat (limited to 'llvm/runtimes')
-rw-r--r--llvm/runtimes/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index ca14128..836e914 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -90,8 +90,7 @@ function(builtin_default_target compiler_rt_path)
-DCMAKE_ASM_COMPILER_WORKS=ON
${COMMON_CMAKE_ARGS}
${BUILTINS_CMAKE_ARGS}
- PASSTHROUGH_PREFIXES CMAKE_OSX
- COMPILER_RT
+ PASSTHROUGH_PREFIXES COMPILER_RT
DARWIN
SANITIZER
USE_TOOLCHAIN
@@ -249,8 +248,7 @@ function(runtime_default_target)
-DCMAKE_ASM_COMPILER_WORKS=ON
${COMMON_CMAKE_ARGS}
${RUNTIMES_CMAKE_ARGS}
- PASSTHROUGH_PREFIXES CMAKE_OSX
- LLVM_ENABLE_RUNTIMES
+ PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
LLVM_USE_LINKER
${ARG_PREFIXES}
EXTRA_TARGETS ${extra_targets}