Skip to content

Commit 6c30a5e

Browse files
committed
Default Linux toolchain linker to gold
The BFD linker on most of the Linux box is unable to link Swift objects. Currently the Swift driver hard-codes forcing the default linker to gold, but we want to support configuring this, so we need build-script to force it at the clang level instead. Cherry-Picks: d63152f 7596d00 8262552
1 parent db4aa81 commit 6c30a5e

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

utils/build-presets.ini

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ reconfigure
916916

917917
# gcc version on amazon linux 2 is too old to configure and build tablegen.
918918
# Use the clang that we install in the path for macros
919-
llvm-cmake-options=-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++'
919+
llvm-cmake-options=-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++;-DCLANG_DEFAULT_LINKER=gold'
920920

921921
[preset: buildbot_linux]
922922
mixin-preset=
@@ -1086,6 +1086,8 @@ reconfigure
10861086
test-optimized
10871087
skip-test-swiftdocc
10881088

1089+
llvm-cmake-options=
1090+
-DCLANG_DEFAULT_LINKER=gold
10891091

10901092
[preset: buildbot_linux_1404_no_lldb]
10911093
mixin-preset=buildbot_incremental_linux
@@ -1165,6 +1167,8 @@ reconfigure
11651167
# in Linux CI bots
11661168
relocate-xdg-cache-home-under-build-subdir
11671169

1170+
llvm-cmake-options=
1171+
-DCLANG_DEFAULT_LINKER=gold
11681172

11691173
[preset: buildbot_incremental_linux]
11701174
mixin-preset=
@@ -1829,6 +1833,9 @@ skip-test-foundation
18291833
skip-test-libdispatch
18301834
skip-test-xctest
18311835

1836+
llvm-cmake-options=
1837+
-DCLANG_DEFAULT_LINKER=gold
1838+
18321839
# Builds enough of the toolchain to build a swift package on macOS.
18331840
[preset: mixin_swiftpm_package_macos_platform]
18341841
mixin-preset=mixin_swiftpm_macos_platform
@@ -1851,6 +1858,8 @@ mixin-preset=mixin_swiftpm_linux_platform
18511858
skip-test-llbuild
18521859
skip-test-swiftpm
18531860

1861+
llvm-cmake-options=
1862+
-DCLANG_DEFAULT_LINKER=gold
18541863

18551864
#===------------------------------------------------------------------------===#
18561865
# Test swiftPM on macOS builder
@@ -2123,6 +2132,9 @@ skip-test-swift
21232132
skip-test-libdispatch
21242133
skip-test-foundation
21252134

2135+
llvm-cmake-options=
2136+
-DCLANG_DEFAULT_LINKER=gold
2137+
21262138
#===------------------------------------------------------------------------===#
21272139
# Remote Mirror Library
21282140
#===------------------------------------------------------------------------===#
@@ -2951,6 +2963,9 @@ install-libdispatch
29512963
install-xctest
29522964
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license
29532965

2966+
llvm-cmake-options=
2967+
-DCLANG_DEFAULT_LINKER=gold
2968+
29542969
[preset: source_compat_suite_macos_DA]
29552970
mixin-preset=source_compat_suite_macos_base
29562971
debug
@@ -3040,3 +3055,6 @@ skip-test-cmark
30403055
skip-test-swift
30413056
skip-build-benchmarks
30423057
skip-test-foundation
3058+
3059+
llvm-cmake-options=
3060+
-DCLANG_DEFAULT_LINKER=gold

0 commit comments

Comments
 (0)