Auto merge of #52399 - semarie:llvmtools, r=alexcrichton

Disable LlvmTools packaging with external LLVM Fixes: #52102
rust-lang · Jul 15, 2018 · fb8bde0 · fb8bde0
2 parents 7751885 + 7e7c214
commit fb8bde0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -1907,6 +1907,15 @@ impl Step for LlvmTools {
         let target = self.target;
         assert!(builder.config.extended);
 
+        /* run only if llvm-config isn't used */
+        if let Some(config) = builder.config.target_config.get(&target) {
+            if let Some(ref _s) = config.llvm_config {
+                builder.info(&format!("Skipping LlvmTools stage{} ({}): external LLVM",
+                    stage, target));
+                return None;
+            }
+        }
+
         builder.info(&format!("Dist LlvmTools stage{} ({})", stage, target));
         let src = builder.src.join("src/llvm");
         let name = pkgname(builder, "llvm-tools");