Author: cbieneman
Date: Tue Feb 9 19:09:56 2016
New Revision: 260340
URL: http://llvm.org/viewvc/llvm-project?rev=260340&view=rev
Log:
[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.
Added:
cfe/trunk/cmake/caches/3-stage-base.cmake
Modified:
cfe/trunk/cmake/caches/3-stage.cmake
Added: cfe/trunk/cmake/caches/3-stage-base.cmake
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/caches/3-stage-base.cmake?rev=260340&view=auto
==============================================================================
--- cfe/trunk/cmake/caches/3-stage-base.cmake (added)
+++ cfe/trunk/cmake/caches/3-stage-base.cmake Tue Feb 9 19:09:56 2016
@@ -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 "")
Modified: cfe/trunk/cmake/caches/3-stage.cmake
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/caches/3-stage.cmake?rev=260340&r1=260339&r2=260340&view=diff
==============================================================================
--- cfe/trunk/cmake/caches/3-stage.cmake (original)
+++ cfe/trunk/cmake/caches/3-stage.cmake Tue Feb 9 19:09:56 2016
@@ -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)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
