Skip to content

Commit c2daa28

Browse files
committed
Do not enable LLD by default in the dist profile
1 parent 6988a8f commit c2daa28

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/bootstrap/defaults/bootstrap.dist.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ download-ci-llvm = false
2020
channel = "auto-detect"
2121
# Never download a rustc, distributions must build a fresh compiler.
2222
download-rustc = false
23-
lld = true
2423
# Build the llvm-bitcode-linker
2524
llvm-bitcode-linker = true
2625

src/bootstrap/src/utils/change_tracker.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,4 +436,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
436436
severity: ChangeSeverity::Info,
437437
summary: "It is no longer possible to combine `rust.lld = true` with configuring external LLVM using `llvm.llvm-config`.",
438438
},
439+
ChangeInfo {
440+
change_id: 143255,
441+
severity: ChangeSeverity::Warning,
442+
summary: "`llvm.lld` is no longer enabled by default for the dist profile.",
443+
},
439444
];

src/ci/run.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,12 @@ fi
8686
# space required for CI artifacts.
8787
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --dist-compression-formats=xz"
8888

89-
if [ "$EXTERNAL_LLVM" = "1" ]; then
90-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.lld=false"
91-
fi
92-
9389
# Enable the `c` feature for compiler_builtins, but only when the `compiler-rt` source is available
9490
# (to avoid spending a lot of time cloning llvm)
9591
if [ "$EXTERNAL_LLVM" = "" ]; then
92+
# Enable building & shipping lld
93+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.lld=true"
94+
9695
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins"
9796
# Likewise, only demand we test all LLVM components if we know we built LLVM with them
9897
export COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS=1

0 commit comments

Comments
 (0)