From af7fefea7dd5e719f132ecb262047610c4fc7fc1 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sat, 11 Jan 2025 05:24:59 +0800 Subject: [PATCH] Do not hardcode Xcode ld diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 92f902af31f..261bb9226e8 100644 --- llvm/cmake/config-ix.cmake +++ llvm/cmake/config-ix.cmake @@ -539,15 +539,16 @@ set(LLVM_BINUTILS_INCDIR "" CACHE PATH "PATH to binutils/include containing plugin-api.h for gold plugin.") if(CMAKE_HOST_APPLE AND APPLE) - if(NOT CMAKE_XCRUN) - find_program(CMAKE_XCRUN NAMES xcrun) - endif() - if(CMAKE_XCRUN) - execute_process(COMMAND ${CMAKE_XCRUN} -find ld - OUTPUT_VARIABLE LD64_EXECUTABLE - OUTPUT_STRIP_TRAILING_WHITESPACE) - else() - find_program(LD64_EXECUTABLE NAMES ld DOC "The ld64 linker") + find_program(LD64_EXECUTABLE NAMES ld DOC "The ld64 linker") + if(NOT LD64_EXECUTABLE) + if(NOT CMAKE_XCRUN) + find_program(CMAKE_XCRUN NAMES xcrun) + endif() + if(CMAKE_XCRUN) + execute_process(COMMAND ${CMAKE_XCRUN} -find ld + OUTPUT_VARIABLE LD64_EXECUTABLE + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() endif() if(LD64_EXECUTABLE)