winksaville updated this revision to Diff 201288. winksaville added a comment.
Added libcxxabi and rebased Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D62279/new/ https://reviews.llvm.org/D62279 Files: clang/cmake/caches/DistributionExample-stage2.cmake clang/cmake/caches/DistributionExample.cmake Index: clang/cmake/caches/DistributionExample.cmake =================================================================== --- clang/cmake/caches/DistributionExample.cmake +++ clang/cmake/caches/DistributionExample.cmake @@ -2,7 +2,7 @@ #Enable LLVM projects and runtimes set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld" CACHE STRING "") -set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") # Only build the native target in stage1 since it is a throwaway build. set(LLVM_TARGETS_TO_BUILD Native CACHE STRING "") @@ -17,6 +17,11 @@ # the proper LTO library dependencies can be connected. set(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "") +if (NOT APPLE) + # Since LLVM_ENABLE_LTO is ON we need a LTO capable linker + set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "") +endif() + # Expose stage2 targets through the stage1 build configuration. set(CLANG_BOOTSTRAP_TARGETS check-all Index: clang/cmake/caches/DistributionExample-stage2.cmake =================================================================== --- clang/cmake/caches/DistributionExample-stage2.cmake +++ clang/cmake/caches/DistributionExample-stage2.cmake @@ -2,7 +2,7 @@ # bootstrap build. set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld" CACHE STRING "") -set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64 CACHE STRING "")
Index: clang/cmake/caches/DistributionExample.cmake =================================================================== --- clang/cmake/caches/DistributionExample.cmake +++ clang/cmake/caches/DistributionExample.cmake @@ -2,7 +2,7 @@ #Enable LLVM projects and runtimes set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld" CACHE STRING "") -set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") # Only build the native target in stage1 since it is a throwaway build. set(LLVM_TARGETS_TO_BUILD Native CACHE STRING "") @@ -17,6 +17,11 @@ # the proper LTO library dependencies can be connected. set(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "") +if (NOT APPLE) + # Since LLVM_ENABLE_LTO is ON we need a LTO capable linker + set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "") +endif() + # Expose stage2 targets through the stage1 build configuration. set(CLANG_BOOTSTRAP_TARGETS check-all Index: clang/cmake/caches/DistributionExample-stage2.cmake =================================================================== --- clang/cmake/caches/DistributionExample-stage2.cmake +++ clang/cmake/caches/DistributionExample-stage2.cmake @@ -2,7 +2,7 @@ # bootstrap build. set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld" CACHE STRING "") -set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") +set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64 CACHE STRING "")
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
