[CMake] Fixing the 3-stage cmake cache.

I had hoped this would work from a single cache file, but turns out there is a bug I can't quite figure out relating to passing list arguments to recursive CMake invocations.

This change works around that.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260340 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/caches/3-stage-base.cmake b/cmake/caches/3-stage-base.cmake
new file mode 100644 (file)
index 0000000..6c93ec0
--- /dev/null
+++ b/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/cmake/caches/3-stage.cmake b/cmake/caches/3-stage.cmake
index 62de9601b6b33e5339658a2c14b3efa0fca88258..d91d339b5eab3c09f95b5d5cd2d74b99859442ad 100644 (file)
--- a/cmake/caches/3-stage.cmake
+++ b/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)