[llvm] ececce1 - Partially revert "[CMake] Passthrough OSX CMake options to builtins and runtimes"

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2022-05-18T17:02:02Z
New Revision: ececce1b5ec1a83434568591e4c18ac79e4f3631

URL: https://github.com/llvm/llvm-project/commit/ececce1b5ec1a83434568591e4c18ac79e4f3631
DIFF: https://github.com/llvm/llvm-project/commit/ececce1b5ec1a83434568591e4c18ac79e4f3631.diff

LOG: 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.

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index ca1412881666a..836e9149a71fe 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}