diff options
| author | Chris Bieneman <beanz@apple.com> | 2017-10-03 21:59:53 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2017-10-03 21:59:53 +0000 |
| commit | 2834b006a481758130e3c397f18cefcfdd90ac5d (patch) | |
| tree | 02c089356797965d64f2daedaa6de6f3af977bb6 /clang/cmake | |
| parent | 22bc039c89eb5e4830ce58b26dc56cc92014b1af (diff) | |
| download | bcm5719-llvm-2834b006a481758130e3c397f18cefcfdd90ac5d.tar.gz bcm5719-llvm-2834b006a481758130e3c397f18cefcfdd90ac5d.zip | |
[CMake] Minor updates to Apple CMake caches
* Turn off embedded compiler-rt builds in stage1
* Support generating Xcode toolchains from Stage2 build configurations
llvm-svn: 314854
Diffstat (limited to 'clang/cmake')
| -rw-r--r-- | clang/cmake/caches/Apple-stage1.cmake | 7 | ||||
| -rw-r--r-- | clang/cmake/caches/Apple-stage2.cmake | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/clang/cmake/caches/Apple-stage1.cmake b/clang/cmake/caches/Apple-stage1.cmake index 32159811a88..30b8972d276 100644 --- a/clang/cmake/caches/Apple-stage1.cmake +++ b/clang/cmake/caches/Apple-stage1.cmake @@ -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 diff --git a/clang/cmake/caches/Apple-stage2.cmake b/clang/cmake/caches/Apple-stage2.cmake index f07973dc0ab..8826fc12de9 100644 --- a/clang/cmake/caches/Apple-stage2.cmake +++ b/clang/cmake/caches/Apple-stage2.cmake @@ -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 |
