Skip to content

Commit 890f81b

Browse files
committed
Make combining LLD with external LLVM config a hard error
1 parent dddd7ab commit 890f81b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ impl Step for Assemble {
22412241
debug!("copying codegen backends to sysroot");
22422242
copy_codegen_backends_to_sysroot(builder, build_compiler, target_compiler);
22432243

2244-
if builder.config.lld_enabled && !builder.config.is_system_llvm(target_compiler.host) {
2244+
if builder.config.lld_enabled {
22452245
builder.ensure(crate::core::build_steps::tool::LldWrapper {
22462246
build_compiler,
22472247
target_compiler,

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,9 +1003,7 @@ impl Config {
10031003
}
10041004

10051005
if config.lld_enabled && config.is_system_llvm(config.host_target) {
1006-
eprintln!(
1007-
"Warning: LLD is enabled when using external llvm-config. LLD will not be built and copied to the sysroot."
1008-
);
1006+
panic!("Cannot enable LLD with `rust.lld = true` when using external llvm-config.");
10091007
}
10101008

10111009
config.optimized_compiler_builtins =

0 commit comments

Comments
 (0)