From 3f7ef2d7335a29531f3499c1b942537c12809f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sun, 15 Jul 2018 09:23:36 +0200 Subject: [PATCH 1/2] Disable LlvmTools packaging with external LLVM Fixes: #52102 --- src/bootstrap/dist.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index ca804abd26ac..4bfd89e90e6b 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1907,6 +1907,14 @@ 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"); From 7e7c21492f257d688f08c19b206224198c93e6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sun, 15 Jul 2018 09:58:58 +0200 Subject: [PATCH 2/2] tidy: avoid long line --- src/bootstrap/dist.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 4bfd89e90e6b..7b4808ef018f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1910,7 +1910,8 @@ impl Step for LlvmTools { /* 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)); + builder.info(&format!("Skipping LlvmTools stage{} ({}): external LLVM", + stage, target)); return None; } }