File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ download-ci-llvm = false
20
20
channel = " auto-detect"
21
21
# Never download a rustc, distributions must build a fresh compiler.
22
22
download-rustc = false
23
- lld = true
24
23
# Build the llvm-bitcode-linker
25
24
llvm-bitcode-linker = true
26
25
Original file line number Diff line number Diff line change @@ -436,4 +436,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
436
436
severity : ChangeSeverity :: Info ,
437
437
summary : "It is no longer possible to combine `rust.lld = true` with configuring external LLVM using `llvm.llvm-config`." ,
438
438
} ,
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
+ } ,
439
444
] ;
Original file line number Diff line number Diff line change 86
86
# space required for CI artifacts.
87
87
RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --dist-compression-formats=xz"
88
88
89
- if [ " $EXTERNAL_LLVM " = " 1" ]; then
90
- RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set rust.lld=false"
91
- fi
92
-
93
89
# Enable the `c` feature for compiler_builtins, but only when the `compiler-rt` source is available
94
90
# (to avoid spending a lot of time cloning llvm)
95
91
if [ " $EXTERNAL_LLVM " = " " ]; then
92
+ # Enable building & shipping lld
93
+ RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set rust.lld=true"
94
+
96
95
RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins"
97
96
# Likewise, only demand we test all LLVM components if we know we built LLVM with them
98
97
export COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS=1
You can’t perform that action at this time.
0 commit comments