From 301e29804045ccae119ce4b53a8c05b1db009604 Mon Sep 17 00:00:00 2001 From: Ankit Meel Date: Thu, 30 Jan 2025 18:21:38 +0100 Subject: [PATCH] Build: Remove macOS mold and lld linkers support The mold linker doesn't support macOS anymore. The sold linker gets no new releases since the Xcode 15+ linker is at par with sold. https://github.com/bluewhalesystems/sold/issues/50#issuecomment-2076249631 https://github.com/rui314/mold/issues/189#issuecomment-1495288926 Pull Request: https://projects.blender.org/blender/blender/pulls/133634 --- CMakeLists.txt | 2 +- .../cmake/platform/platform_apple.cmake | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b14bbaadbb8..a6e71984519 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -973,7 +973,7 @@ Ensure string operations on fixed size buffers \ mark_as_advanced(WITH_STRSIZE_DEBUG) # Compiler tool-chain. -if(UNIX) +if(UNIX AND NOT APPLE) if(CMAKE_COMPILER_IS_GNUCC) option(WITH_LINKER_GOLD "Use ld.gold linker which is usually faster than ld.bfd" ON) mark_as_advanced(WITH_LINKER_GOLD) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 8275f9e1bbd..ecec37efed4 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -477,31 +477,6 @@ if(WITH_COMPILER_CCACHE) endif() endif() -unset(_custom_LINKER_FUSE_FLAG) -if(WITH_LINKER_LLD) - find_program(LLD_PROGRAM ld.lld) - if(LLD_PROGRAM) - set(_custom_LINKER_FUSE_FLAG "-fuse-ld=lld") - else() - message(WARNING "LLD linker NOT found, disabling WITH_LINKER_LLD") - set(WITH_LINKER_LLD OFF) - endif() -endif() -if(WITH_LINKER_MOLD) - find_program(MOLD_PROGRAM mold) - if(MOLD_PROGRAM) - set(_custom_LINKER_FUSE_FLAG "-fuse-ld=mold") - else() - message(WARNING "Mold linker NOT found, disabling WITH_LINKER_MOLD") - set(WITH_LINKER_MOLD OFF) - endif() -endif() - -if(_custom_LINKER_FUSE_FLAG) - add_link_options(${_custom_LINKER_FUSE_FLAG}) -endif() - - if(WITH_COMPILER_ASAN) list(APPEND PLATFORM_BUNDLED_LIBRARIES ${COMPILER_ASAN_LIBRARY}) endif()