Skip to content

Commit ececce1

Browse files
committed
Partially revert "[CMake] Passthrough OSX CMake options to builtins and runtimes"
This partially reverts commit 9cddfe3, specifically passthrough for CMAKE_OSX_* since this can lead to build passing through internal variables when it's not intended.
1 parent eafa053 commit ececce1

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

llvm/runtimes/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ function(builtin_default_target compiler_rt_path)
9090
-DCMAKE_ASM_COMPILER_WORKS=ON
9191
${COMMON_CMAKE_ARGS}
9292
${BUILTINS_CMAKE_ARGS}
93-
PASSTHROUGH_PREFIXES CMAKE_OSX
94-
COMPILER_RT
93+
PASSTHROUGH_PREFIXES COMPILER_RT
9594
DARWIN
9695
SANITIZER
9796
USE_TOOLCHAIN
@@ -249,8 +248,7 @@ function(runtime_default_target)
249248
-DCMAKE_ASM_COMPILER_WORKS=ON
250249
${COMMON_CMAKE_ARGS}
251250
${RUNTIMES_CMAKE_ARGS}
252-
PASSTHROUGH_PREFIXES CMAKE_OSX
253-
LLVM_ENABLE_RUNTIMES
251+
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
254252
LLVM_USE_LINKER
255253
${ARG_PREFIXES}
256254
EXTRA_TARGETS ${extra_targets}

0 commit comments

Comments
 (0)