[clang] 7dfcf93 - [CMake] Move cxx-headers to RUNTIME_DISTRIBUTION_COMPONENTS in Apple-stage2.cmake

[Louis Dionne via cfe-commits]

Author: Louis Dionne
Date: 2022-08-23T17:02:51-04:00
New Revision: 7dfcf9342b5af794aadd4ca81490090fe7ca6a45

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

LOG: [CMake] Move cxx-headers to RUNTIME_DISTRIBUTION_COMPONENTS in Apple-stage2.cmake

We build libcxx using LLVM_ENABLE_RUNTIMES during Stage2, which requires
cxx-headers to be part of LLVM_RUNTIME_DISTRIBUTION_COMPONENTS instead
of LLVM_DISTRIBUTION_COMPONENTS.

rdar://99028431

Differential Revision: https://reviews.llvm.org/D132488

Added: 
    

Modified: 
    clang/cmake/caches/Apple-stage2.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Apple-stage2.cmake b/clang/cmake/caches/Apple-stage2.cmake
index a2eb42efbaf67..63f92eab8c1e5 100644
--- a/clang/cmake/caches/Apple-stage2.cmake
+++ b/clang/cmake/caches/Apple-stage2.cmake
@@ -1,7 +1,7 @@
 # This file sets up a CMakeCache for Apple-style stage2 bootstrap. It is
 # specified by the stage1 build.
 
-set(LLVM_TARGETS_TO_BUILD X86 ARM AArch64 CACHE STRING "") 
+set(LLVM_TARGETS_TO_BUILD X86 ARM AArch64 CACHE STRING "")
 set(PACKAGE_VENDOR Apple CACHE STRING "")
 set(CLANG_VENDOR_UTI com.apple.clang CACHE STRING "")
 set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "")
@@ -74,12 +74,15 @@ set(LLVM_DISTRIBUTION_COMPONENTS
   LTO
   clang-format
   clang-resource-headers
-  cxx-headers
   Remarks
   ${LLVM_TOOLCHAIN_TOOLS}
   ${LLVM_TOOLCHAIN_UTILITIES}
   CACHE STRING "")
 
+set(LLVM_RUNTIME_DISTRIBUTION_COMPONENTS
+  cxx-headers
+  CACHE STRING "")
+
 # test args
 
 set(LLVM_LIT_ARGS "--xunit-xml-output=testresults.xunit.xml -v" CACHE STRING "")