mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #126479 - Kobzol:disable-llvm-linker-by-default, r=onur-ozkan

Browse Source 
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 (https://github.com/rust-lang/rust/issues/122491, https://github.com/rust-lang/rust/issues/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: https://github.com/rust-lang/rust/issues/126464
This commit is contained in:
bors 2024-06-16 01:07:45 +00:00
commit bc3618f31e
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.example.toml
View File

@ -657,7 +657,7 @@
# whether to set it as rustc's default linker on `x86_64-unknown-linux-gnu`. This will also only be # whether to set it as rustc's default linker on `x86_64-unknown-linux-gnu`. This will also only be
# when *not* building an external LLVM (so only when using `download-ci-llvm` or building LLVM from # when *not* building an external LLVM (so only when using `download-ci-llvm` or building LLVM from
# the in-tree source): setting `llvm-config` in the `[target.x86_64-unknown-linux-gnu]` section will # the in-tree source): setting `llvm-config` in the `[target.x86_64-unknown-linux-gnu]` section will
# make this default to false. # make this default to false.
#lld = false in all cases, except on `x86_64-unknown-linux-gnu` as described above, where it is true #lld = false in all cases, except on `x86_64-unknown-linux-gnu` as described above, where it is true
# Indicates whether LLD will be used to link Rust crates during bootstrap on # Indicates whether LLD will be used to link Rust crates during bootstrap on
@ -676,7 +676,7 @@
#llvm-tools = true #llvm-tools = true
# Indicates whether the `self-contained` llvm-bitcode-linker, will be made available # Indicates whether the `self-contained` llvm-bitcode-linker, will be made available
# in the sysroot # in the sysroot. It is required for running nvptx tests.
#llvm-bitcode-linker = false #llvm-bitcode-linker = false
# Whether to deny warnings in crates # Whether to deny warnings in crates

2
src/bootstrap/defaults/config.compiler.toml
View File

@ -19,8 +19,6 @@ lto = "off"
# Forces frame pointers to be used with `-Cforce-frame-pointers`. # Forces frame pointers to be used with `-Cforce-frame-pointers`.
# This can be helpful for profiling at a small performance cost. # This can be helpful for profiling at a small performance cost.
frame-pointers = true frame-pointers = true
# Build the llvm-bitcode-linker as it is required for running nvptx tests
llvm-bitcode-linker = true
[llvm] [llvm]
# Having this set to true disrupts compiler development workflows for people who use `llvm.download-ci-llvm = true` # Having this set to true disrupts compiler development workflows for people who use `llvm.download-ci-llvm = true`

2
src/bootstrap/defaults/config.dist.toml
View File

@ -16,7 +16,7 @@ download-ci-llvm = false
# Make sure they don't get set when installing from source. # Make sure they don't get set when installing from source.
channel = "nightly" channel = "nightly"
download-rustc = false download-rustc = false
# Build the llvm-bitcode-linker as it is required for running nvptx tests # Build the llvm-bitcode-linker
llvm-bitcode-linker = true llvm-bitcode-linker = true
[dist] [dist]

2
src/bootstrap/defaults/config.library.toml
View File

@ -10,8 +10,6 @@ bench-stage = 0
incremental = true incremental = true
# Make the compiler and standard library faster to build, at the expense of a ~20% runtime slowdown. # Make the compiler and standard library faster to build, at the expense of a ~20% runtime slowdown.
lto = "off" lto = "off"
# Build the llvm-bitcode-linker as it is required for running nvptx tests
llvm-bitcode-linker = true
[llvm] [llvm]
# Will download LLVM from CI if available on your platform. # Will download LLVM from CI if available on your platform.

2
src/bootstrap/defaults/config.tools.toml
View File

@ -12,8 +12,6 @@ incremental = true
# Using these defaults will download the stage2 compiler (see `download-rustc` # Using these defaults will download the stage2 compiler (see `download-rustc`
# setting) and the stage2 toolchain should therefore be used for these defaults. # setting) and the stage2 toolchain should therefore be used for these defaults.
download-rustc = "if-unchanged" download-rustc = "if-unchanged"
# Build the llvm-bitcode-linker as it is required for running nvptx tests
llvm-bitcode-linker = true
[build] [build]
# Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile. # Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile.