Skip to content

Commit 3f7ef2d

Browse files
committed
Disable LlvmTools packaging with external LLVM
Fixes: #52102
1 parent cc903c6 commit 3f7ef2d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/bootstrap/dist.rs

+8
Original file line numberDiff line numberDiff line change
@@ -1907,6 +1907,14 @@ impl Step for LlvmTools {
19071907
let target = self.target;
19081908
assert!(builder.config.extended);
19091909

1910+
/* run only if llvm-config isn't used */
1911+
if let Some(config) = builder.config.target_config.get(&target) {
1912+
if let Some(ref _s) = config.llvm_config {
1913+
builder.info(&format!("Skipping LlvmTools stage{} ({}): external LLVM", stage, target));
1914+
return None;
1915+
}
1916+
}
1917+
19101918
builder.info(&format!("Dist LlvmTools stage{} ({})", stage, target));
19111919
let src = builder.src.join("src/llvm");
19121920
let name = pkgname(builder, "llvm-tools");

0 commit comments

Comments
 (0)