From: Petr Hosek Date: Mon, 11 Jun 2018 22:06:44 +0000 (+0000) Subject: [CMake] Use libc++ and compiler-rt for bootstrap Fuchsia Clang X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41c96f035683aee38a29a477c0bdb03158df6fc0;p=clang [CMake] Use libc++ and compiler-rt for bootstrap Fuchsia Clang We want to build the second stage compiler with libc++ and compiler-rt, also include builtins and runtimes into extra bootstrap components to ensure these get built. Differential Revision: https://reviews.llvm.org/D47356 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@334445 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/caches/Fuchsia.cmake b/cmake/caches/Fuchsia.cmake index 3055e8d5d3..ee7b69bc29 100644 --- a/cmake/caches/Fuchsia.cmake +++ b/cmake/caches/Fuchsia.cmake @@ -21,6 +21,9 @@ if(NOT APPLE) set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "") endif() +set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") +set(CLANG_DEFAULT_RTLIB compiler-rt CACHE STRING "") + if(APPLE) set(COMPILER_RT_ENABLE_IOS OFF CACHE BOOL "") set(COMPILER_RT_ENABLE_TVOS OFF CACHE BOOL "") @@ -51,6 +54,10 @@ endforeach() # Setup the bootstrap build. set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "") +set(CLANG_BOOTSTRAP_EXTRA_DEPS + builtins + runtimes + CACHE STRING "") set(CLANG_BOOTSTRAP_CMAKE_ARGS ${EXTRA_ARGS} -C ${CMAKE_CURRENT_LIST_DIR}/Fuchsia-stage2.cmake