[clang] b1320f7 - [clang] Explicitly add libcxx and libcxxabi runtimes during Stage2 builds

[Louis Dionne via cfe-commits]

Author: Louis Dionne
Date: 2022-08-24T09:13:29-04:00
New Revision: b1320f7c9b907d39c8ceca9b91d66046441f1ae3

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

LOG: [clang] Explicitly add libcxx and libcxxabi runtimes during Stage2 builds

For the time being, we are still building libc++ and libc++abi's headers
during stage 2 builds. Encode that in the cache file so that CI jobs don't
have to manually specify LLVM_ENABLE_RUNTIMES when doing a stage 2 build.

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 3ed725132cab..72cdedd611bc 100644
--- a/clang/cmake/caches/Apple-stage2.cmake
+++ b/clang/cmake/caches/Apple-stage2.cmake
@@ -76,7 +76,7 @@ set(LLVM_DISTRIBUTION_COMPONENTS
   CACHE STRING "")
 
 # Build the libc++ headers
-# Note that LLVM_ENABLE_RUNTIMES must be passed on the command-line.
+set(LLVM_ENABLE_RUNTIMES "libcxx;libcxxabi" CACHE STRING "")
 set(LLVM_RUNTIME_DISTRIBUTION_COMPONENTS cxx-headers CACHE STRING "")
 set(LIBCXX_INSTALL_LIBRARY OFF CACHE BOOL "")
 set(LIBCXX_INSTALL_HEADERS ON CACHE BOOL "")