Skip to content

Commit bc3618f

Browse files
committed
Auto merge of rust-lang#126479 - Kobzol:disable-llvm-linker-by-default, r=onur-ozkan
Disable `llvm-bitcode-linker` in the default bootstrap profiles I don't think that we really need to enable `llvm-bitcode-linker` in the default bootstrap profiles, since it seems that it is only useful for running `nvptx` tests. It should be enabled on CI, which it is, and that should be enough. People can enable it easily locally, if they want. The linker causes occasionally some rebuild issues (rust-lang#122491, rust-lang#126464), but more importantly it is just needless work to build it locally. I kept it enabled for `dist`, because it is distributed as a `rustup` component (for some reason it's not included in `extended`? not sure). Fixes: rust-lang#126464
2 parents d5b34a2 + b4df72a commit bc3618f

File tree

5 files changed

+3
-9
lines changed

5 files changed

+3
-9
lines changed

config.example.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
# whether to set it as rustc's default linker on `x86_64-unknown-linux-gnu`. This will also only be
658658
# when *not* building an external LLVM (so only when using `download-ci-llvm` or building LLVM from
659659
# the in-tree source): setting `llvm-config` in the `[target.x86_64-unknown-linux-gnu]` section will
660-
# make this default to false.
660+
# make this default to false.
661661
#lld = false in all cases, except on `x86_64-unknown-linux-gnu` as described above, where it is true
662662

663663
# Indicates whether LLD will be used to link Rust crates during bootstrap on
@@ -676,7 +676,7 @@
676676
#llvm-tools = true
677677

678678
# Indicates whether the `self-contained` llvm-bitcode-linker, will be made available
679-
# in the sysroot
679+
# in the sysroot. It is required for running nvptx tests.
680680
#llvm-bitcode-linker = false
681681

682682
# Whether to deny warnings in crates

src/bootstrap/defaults/config.compiler.toml

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ lto = "off"
1919
# Forces frame pointers to be used with `-Cforce-frame-pointers`.
2020
# This can be helpful for profiling at a small performance cost.
2121
frame-pointers = true
22-
# Build the llvm-bitcode-linker as it is required for running nvptx tests
23-
llvm-bitcode-linker = true
2422

2523
[llvm]
2624
# Having this set to true disrupts compiler development workflows for people who use `llvm.download-ci-llvm = true`

src/bootstrap/defaults/config.dist.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ download-ci-llvm = false
1616
# Make sure they don't get set when installing from source.
1717
channel = "nightly"
1818
download-rustc = false
19-
# Build the llvm-bitcode-linker as it is required for running nvptx tests
19+
# Build the llvm-bitcode-linker
2020
llvm-bitcode-linker = true
2121

2222
[dist]

src/bootstrap/defaults/config.library.toml

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ bench-stage = 0
1010
incremental = true
1111
# Make the compiler and standard library faster to build, at the expense of a ~20% runtime slowdown.
1212
lto = "off"
13-
# Build the llvm-bitcode-linker as it is required for running nvptx tests
14-
llvm-bitcode-linker = true
1513

1614
[llvm]
1715
# Will download LLVM from CI if available on your platform.

src/bootstrap/defaults/config.tools.toml

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ incremental = true
1212
# Using these defaults will download the stage2 compiler (see `download-rustc`
1313
# setting) and the stage2 toolchain should therefore be used for these defaults.
1414
download-rustc = "if-unchanged"
15-
# Build the llvm-bitcode-linker as it is required for running nvptx tests
16-
llvm-bitcode-linker = true
1715

1816
[build]
1917
# Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile.

0 commit comments

Comments
 (0)