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
2020channel = " auto-detect"
2121# Never download a rustc, distributions must build a fresh compiler.
2222download-rustc = false
23- lld = true
2423# Build the llvm-bitcode-linker
2524llvm-bitcode-linker = true
2625
Original file line number Diff line number Diff 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] ;
Original file line number Diff line number Diff line change 8686# space required for CI artifacts.
8787RUST_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)
9591if [ " $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
You can’t perform that action at this time.
0 commit comments