summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/cmake/caches/3-stage-base.cmake16
-rw-r--r--clang/cmake/caches/3-stage.cmake22
2 files changed, 17 insertions, 21 deletions
diff --git a/clang/cmake/caches/3-stage-base.cmake b/clang/cmake/caches/3-stage-base.cmake
new file mode 100644
index 00000000000..6c93ec0b477
--- /dev/null
+++ b/clang/cmake/caches/3-stage-base.cmake
@@ -0,0 +1,16 @@
+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(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "")
+
+set(CLANG_BOOTSTRAP_TARGETS
+ clang
+ check-all
+ check-llvm
+ check-clang
+ test-suite CACHE STRING "")
+
+set(CLANG_BOOTSTRAP_CMAKE_ARGS
+ -C ${CMAKE_CURRENT_LIST_DIR}/3-stage-base.cmake
+ CACHE STRING "")
diff --git a/clang/cmake/caches/3-stage.cmake b/clang/cmake/caches/3-stage.cmake
index 62de9601b6b..d91d339b5ea 100644
--- a/clang/cmake/caches/3-stage.cmake
+++ b/clang/cmake/caches/3-stage.cmake
@@ -1,18 +1,3 @@
-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(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "")
-
-set(CLANG_BOOTSTRAP_PASSTHROUGH
- CLANG_ENABLE_BOOTSTRAP
- LLVM_BUILD_EXTERNAL_COMPILER_RT
- LLVM_TARGETS_TO_BUILD
- CLANG_BOOTSTRAP_PASSTHROUGH
- BOOTSTRAP_LLVM_ENABLE_LTO
- CMAKE_BUILD_TYPE
- CACHE STRING "")
-
set(CLANG_BOOTSTRAP_TARGETS
clang
check-all
@@ -26,9 +11,4 @@ set(CLANG_BOOTSTRAP_TARGETS
stage3-check-clang
stage3-test-suite CACHE STRING "")
-set(BOOTSTRAP_CLANG_BOOTSTRAP_TARGETS
- clang
- check-all
- check-llvm
- check-clang
- test-suite CACHE STRING "")
+include(${CMAKE_CURRENT_LIST_DIR}/3-stage-base.cmake)
OpenPOWER on IntegriCloud