Author: Louis Dionne Date: 2022-08-24T08:50:52-04:00 New Revision: 3e84cdbee467f97026f1ad421abcaf9b862c1ff4
URL: https://github.com/llvm/llvm-project/commit/3e84cdbee467f97026f1ad421abcaf9b862c1ff4 DIFF: https://github.com/llvm/llvm-project/commit/3e84cdbee467f97026f1ad421abcaf9b862c1ff4.diff LOG: [NFC] Colocate cache values for controling libc++ headers build in stage 2 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 63f92eab8c1e5..3ed725132cabd 100644 --- a/clang/cmake/caches/Apple-stage2.cmake +++ b/clang/cmake/caches/Apple-stage2.cmake @@ -36,10 +36,6 @@ if(LLVM_ENABLE_LTO AND NOT LLVM_ENABLE_LTO STREQUAL "THIN") endif() set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") -set(LIBCXX_INSTALL_LIBRARY OFF CACHE BOOL "") -set(LIBCXX_INSTALL_HEADERS ON CACHE BOOL "") -set(LIBCXX_INCLUDE_TESTS OFF CACHE BOOL "") -set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(LLVM_LTO_VERSION_OFFSET 3000 CACHE STRING "") # Generating Xcode toolchains is useful for developers wanting to build and use @@ -79,9 +75,13 @@ set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_TOOLCHAIN_UTILITIES} CACHE STRING "") -set(LLVM_RUNTIME_DISTRIBUTION_COMPONENTS - cxx-headers - CACHE STRING "") +# Build the libc++ headers +# Note that LLVM_ENABLE_RUNTIMES must be passed on the command-line. +set(LLVM_RUNTIME_DISTRIBUTION_COMPONENTS cxx-headers CACHE STRING "") +set(LIBCXX_INSTALL_LIBRARY OFF CACHE BOOL "") +set(LIBCXX_INSTALL_HEADERS ON CACHE BOOL "") +set(LIBCXX_INCLUDE_TESTS OFF CACHE BOOL "") +set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") # test args _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits