Skip to content

Commit db6d408

Browse files
committed
[build-script] Use use-linker flag
Switching presets to use the `use-linker` flag consistently instead of setting the CMake variables directly.
1 parent c04fa0c commit db6d408

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

utils/build-presets.ini

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -922,11 +922,12 @@ install-libdispatch
922922
install-swiftformat
923923
reconfigure
924924

925+
use-linker=gold
926+
925927
# gcc version on amazon linux 2 is too old to configure and build tablegen.
926928
# Use the clang that we install in the path for macros
927929
llvm-cmake-options=
928930
-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++'
929-
-DCLANG_DEFAULT_LINKER=gold
930931

931932
[preset: buildbot_linux]
932933
mixin-preset=
@@ -1119,11 +1120,12 @@ reconfigure
11191120
test-optimized
11201121
skip-test-swiftdocc
11211122

1123+
use-linker=gold
1124+
11221125
# gcc version on amazon linux 2 is too old to configure and build tablegen.
11231126
# Use the clang that we install in the path for macros
11241127
llvm-cmake-options=
11251128
-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE='-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++'
1126-
-DCLANG_DEFAULT_LINKER=gold
11271129

11281130
[preset: buildbot_linux_1404_no_lldb]
11291131
mixin-preset=buildbot_incremental_linux
@@ -1203,8 +1205,7 @@ reconfigure
12031205
# in Linux CI bots
12041206
relocate-xdg-cache-home-under-build-subdir
12051207

1206-
llvm-cmake-options=
1207-
-DCLANG_DEFAULT_LINKER=gold
1208+
use-linker=gold
12081209

12091210
build-embedded-stdlib-cross-compiling
12101211

@@ -1833,7 +1834,7 @@ skip-test-osx
18331834

18341835
[preset: pr_apple_llvm_project_linux]
18351836

1836-
llvm-cmake-options=-DCLANG_DEFAULT_LINKER=gold
1837+
use-linker=gold
18371838

18381839
foundation
18391840
libdispatch
@@ -1898,8 +1899,7 @@ skip-test-foundation
18981899
skip-test-libdispatch
18991900
skip-test-xctest
19001901

1901-
llvm-cmake-options=
1902-
-DCLANG_DEFAULT_LINKER=gold
1902+
use-linker=gold
19031903

19041904
# SwiftPM package base
19051905
[preset: mixin_swiftpm_package_macos_platform]
@@ -1935,8 +1935,7 @@ skip-test-xctest
19351935
skip-test-llbuild
19361936
skip-test-swiftpm
19371937

1938-
llvm-cmake-options=
1939-
-DCLANG_DEFAULT_LINKER=gold
1938+
use-linker=gold
19401939

19411940
#===------------------------------------------------------------------------===#
19421941
# Test swiftPM on macOS builder
@@ -2207,8 +2206,7 @@ skip-test-swift
22072206
skip-test-libdispatch
22082207
skip-test-foundation
22092208

2210-
llvm-cmake-options=
2211-
-DCLANG_DEFAULT_LINKER=gold
2209+
use-linker=gold
22122210

22132211
#===------------------------------------------------------------------------===#
22142212
# Remote Mirror Library
@@ -3043,8 +3041,7 @@ install-libdispatch
30433041
install-xctest
30443042
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license
30453043

3046-
llvm-cmake-options=
3047-
-DCLANG_DEFAULT_LINKER=gold
3044+
use-linker=gold
30483045

30493046
[preset: source_compat_suite_macos_DA]
30503047
mixin-preset=source_compat_suite_macos_base
@@ -3131,8 +3128,7 @@ skip-test-swift
31313128
skip-build-benchmarks
31323129
skip-test-foundation
31333130

3134-
llvm-cmake-options=
3135-
-DCLANG_DEFAULT_LINKER=gold
3131+
use-linker=gold
31363132

31373133
#===------------------------------------------------------------------------===#
31383134
# Toolchain Bootstrapping Stages

0 commit comments

Comments
 (0)