Author: cbieneman Date: Tue Oct 3 14:59:53 2017 New Revision: 314854 URL: http://llvm.org/viewvc/llvm-project?rev=314854&view=rev Log: [CMake] Minor updates to Apple CMake caches
* Turn off embedded compiler-rt builds in stage1 * Support generating Xcode toolchains from Stage2 build configurations Modified: cfe/trunk/cmake/caches/Apple-stage1.cmake cfe/trunk/cmake/caches/Apple-stage2.cmake Modified: cfe/trunk/cmake/caches/Apple-stage1.cmake URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/caches/Apple-stage1.cmake?rev=314854&r1=314853&r2=314854&view=diff ============================================================================== --- cfe/trunk/cmake/caches/Apple-stage1.cmake (original) +++ cfe/trunk/cmake/caches/Apple-stage1.cmake Tue Oct 3 14:59:53 2017 @@ -24,6 +24,12 @@ set(CLANG_BOOTSTRAP_PASSTHROUGH CMAKE_OSX_ARCHITECTURES CACHE STRING "") +# Disabling embedded darwin compiler-rt on stage1 builds is required because we +# don't build stage1 to support arm code generation. +set(COMPILER_RT_ENABLE_IOS OFF CACHE BOOL "") +set(COMPILER_RT_ENABLE_WATCHOS OFF CACHE BOOL "") +set(COMPILER_RT_ENABLE_TVOS OFF CACHE BOOL "") + set(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "") set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") @@ -39,6 +45,7 @@ set(CLANG_BOOTSTRAP_TARGETS clang-test-depends distribution install-distribution + install-xcode-toolchain clang CACHE STRING "") #bootstrap Modified: cfe/trunk/cmake/caches/Apple-stage2.cmake URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/caches/Apple-stage2.cmake?rev=314854&r1=314853&r2=314854&view=diff ============================================================================== --- cfe/trunk/cmake/caches/Apple-stage2.cmake (original) +++ cfe/trunk/cmake/caches/Apple-stage2.cmake Tue Oct 3 14:59:53 2017 @@ -40,6 +40,10 @@ set(LIBCXX_INSTALL_HEADERS ON CACHE BOOL set(LIBCXX_INCLUDE_TESTS OFF CACHE BOOL "") set(LLVM_LTO_VERSION_OFFSET 3000 CACHE STRING "") +# Generating Xcode toolchains is useful for developers wanting to build and use +# clang without installing over existing tools. +set(LLVM_CREATE_XCODE_TOOLCHAIN ON CACHE BOOL "") + # setup toolchain set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits