Author: Petr Hosek Date: 2022-03-22T01:06:30-07:00 New Revision: abe997bb2dd61188784954ae866352740629985d
URL: https://github.com/llvm/llvm-project/commit/abe997bb2dd61188784954ae866352740629985d DIFF: https://github.com/llvm/llvm-project/commit/abe997bb2dd61188784954ae866352740629985d.diff LOG: [CMake][Fuchsia] Switch to lld on Apple platforms lld Mach-O backend supports all our use cases now. Differential Revision: https://reviews.llvm.org/D122047 Added: Modified: clang/cmake/caches/Fuchsia-stage2.cmake clang/cmake/caches/Fuchsia.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index d64229bd572eb..df15aa65cc9d2 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -9,10 +9,7 @@ set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING " set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "") set(LLVM_ENABLE_DIA_SDK OFF CACHE BOOL "") -if(NOT APPLE) - # TODO: Remove this once we switch to ld64.lld. - set(LLVM_ENABLE_LLD ON CACHE BOOL "") -endif() +set(LLVM_ENABLE_LLD ON CACHE BOOL "") set(LLVM_ENABLE_LTO ON CACHE BOOL "") set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "") set(LLVM_ENABLE_LIBCXX ON CACHE BOOL "") @@ -31,11 +28,8 @@ if(WIN32) endif() set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") -if(NOT APPLE) - # TODO: Remove this once we switch to ld64.lld. - set(CLANG_DEFAULT_LINKER lld CACHE STRING "") - set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") -endif() +set(CLANG_DEFAULT_LINKER lld CACHE STRING "") +set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") set(CLANG_DEFAULT_RTLIB compiler-rt CACHE STRING "") set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "") set(CLANG_ENABLE_STATIC_ANALYZER ON CACHE BOOL "") diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index 8e9e44d5917ed..bf2ea1802963d 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -22,11 +22,8 @@ if(WIN32) endif() set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") -if(NOT APPLE) - # TODO: Remove this once we switch to ld64.lld. - set(CLANG_DEFAULT_LINKER lld CACHE STRING "") - set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") -endif() +set(CLANG_DEFAULT_LINKER lld CACHE STRING "") +set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") set(CLANG_DEFAULT_RTLIB compiler-rt CACHE STRING "") set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "") set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "") @@ -112,11 +109,8 @@ if(UNIX) set(BOOTSTRAP_CMAKE_EXE_LINKER_FLAGS "-ldl -lpthread" CACHE STRING "") endif() +set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "") set(BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "") -if(NOT APPLE) - # TODO: Remove this once we switch to ld64.lld. - set(BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "") -endif() set(CLANG_BOOTSTRAP_TARGETS check-all _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits