From 826255254e8f7634a9c77d2a80cd74ab3d3ef4f0 Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Tue, 21 May 2024 14:03:20 -0700 Subject: [PATCH] Mark more linux linkers This patch fixes more build presets. Anything that builds a clang-linker needs to set the linker to use gold. bfd won't work! --- utils/build-presets.ini | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 4c56346d6260b..54fd7f053ba0b 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -1157,6 +1157,8 @@ reconfigure # in Linux CI bots relocate-xdg-cache-home-under-build-subdir +llvm-cmake-options= + -DCLANG_DEFAULT_LINKER=gold [preset: buildbot_incremental_linux] mixin-preset= @@ -1802,6 +1804,9 @@ skip-test-foundation skip-test-libdispatch skip-test-xctest +llvm-cmake-options= + -DCLANG_DEFAULT_LINKER=gold + # Builds enough of the toolchain to build a swift package on macOS. [preset: mixin_swiftpm_package_macos_platform] mixin-preset=mixin_swiftpm_macos_platform @@ -1824,6 +1829,8 @@ mixin-preset=mixin_swiftpm_linux_platform skip-test-llbuild skip-test-swiftpm +llvm-cmake-options= + -DCLANG_DEFAULT_LINKER=gold #===------------------------------------------------------------------------===# # Test swiftPM on macOS builder @@ -2095,6 +2102,9 @@ skip-test-swift skip-test-libdispatch skip-test-foundation +llvm-cmake-options= + -DCLANG_DEFAULT_LINKER=gold + #===------------------------------------------------------------------------===# # Remote Mirror Library #===------------------------------------------------------------------------===# @@ -2921,6 +2931,9 @@ install-libdispatch install-xctest swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license +llvm-cmake-options= + -DCLANG_DEFAULT_LINKER=gold + [preset: source_compat_suite_macos_DA] mixin-preset=source_compat_suite_macos_base debug