Merge pull request #73760 from etcwilde/ewilde/swift-6.0-set-gold-clang-linker

🍒[Swift 6.0]: Set toolchain clang linker to gold (Linux)

Author: etcwilde

utils/build-presets.ini

@@ -916,7 +916,9 @@ reconfigure
 
 # gcc version on amazon linux 2 is too old to configure and build tablegen.
 # Use the clang that we install in the path for macros
-llvm-cmake-options=-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++'
+llvm-cmake-options=
+  -DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++'
+  -DCLANG_DEFAULT_LINKER=gold
 
 [preset: buildbot_linux]
 mixin-preset=

utils/build-script-impl

@@ -1670,6 +1670,8 @@ for host in "${ALL_HOSTS[@]}"; do
     else
         CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
     fi
+    export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
+    export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
 
     if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
         SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -2780,6 +2782,8 @@ for host in "${ALL_HOSTS[@]}"; do
     else
         CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
     fi
+    export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
+    export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
 
     if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
         SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -3059,6 +3063,20 @@ for host in "${ALL_HOSTS[@]}"; do
         continue
     fi
 
+    # Have to set the clang path or the driver will try to link with the wrong
+    # clang
+    if [[ "${NATIVE_CLANG_TOOLS_PATH}" ]] ; then
+        CLANG_BIN="${NATIVE_CLANG_TOOLS_PATH}"
+        if [[ ! -f "${CLANG_BIN}/clang" ]] ; then
+            echo "error: clang does not exist at the specified native tools path: ${CLANG_BIN}/clang"
+            exit 1
+        fi
+    else
+        CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
+    fi
+    export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
+    export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
+
     # Set the build options for this host
     set_build_options_for_host $host