Author: Chris Bieneman Date: 2022-04-27T14:41:56-05:00 New Revision: 5e096ce6c84fe80a15158dd10d3a23fb7135aa6d
URL: https://github.com/llvm/llvm-project/commit/5e096ce6c84fe80a15158dd10d3a23fb7135aa6d DIFF: https://github.com/llvm/llvm-project/commit/5e096ce6c84fe80a15158dd10d3a23fb7135aa6d.diff LOG: Update PGO and 3-stage cache files These files are out of date and haven't been updated to work within the monorepo. This change updates them appropriately so that they build using the monorepo build infrastructure. Added: Modified: clang/cmake/caches/3-stage-base.cmake clang/cmake/caches/PGO-stage2.cmake clang/cmake/caches/PGO.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/3-stage-base.cmake b/clang/cmake/caches/3-stage-base.cmake index 31391aa4defce..63a1c21528dc9 100644 --- a/clang/cmake/caches/3-stage-base.cmake +++ b/clang/cmake/caches/3-stage-base.cmake @@ -1,6 +1,8 @@ set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "") set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "") -set(LLVM_BUILD_EXTERNAL_COMPILER_RT ON CACHE BOOL "") + +set(LLVM_ENABLE_PROJECTS "clang;lld" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") if(APPLE) # Use LLD to have fewer requirements on system linker, unless we're on an apple diff --git a/clang/cmake/caches/PGO-stage2.cmake b/clang/cmake/caches/PGO-stage2.cmake index 2080cd405f2a6..b9b2f62e9cae4 100644 --- a/clang/cmake/caches/PGO-stage2.cmake +++ b/clang/cmake/caches/PGO-stage2.cmake @@ -1,2 +1,3 @@ set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "") -set(LLVM_BUILD_EXTERNAL_COMPILER_RT ON CACHE BOOL "") +set(LLVM_ENABLE_PROJECTS "clang;lld" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") diff --git a/clang/cmake/caches/PGO.cmake b/clang/cmake/caches/PGO.cmake index 7e4a001129cb9..e1d0585e453f8 100644 --- a/clang/cmake/caches/PGO.cmake +++ b/clang/cmake/caches/PGO.cmake @@ -1,8 +1,10 @@ set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "") set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "") -set(LLVM_BUILD_EXTERNAL_COMPILER_RT ON CACHE BOOL "") -set(LLVM_TARGETS_TO_BUILD X86 CACHE STRING "") +set(LLVM_ENABLE_PROJECTS "clang;lld" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") + +set(LLVM_TARGETS_TO_BUILD Native CACHE STRING "") set(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED ON CACHE BOOL "") set(CLANG_BOOTSTRAP_TARGETS generate-profdata _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits