From 4feaa35f395ab6b649c7cf46671c37492ff8247f Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 15 Nov 2020 08:59:53 -0500 Subject: [PATCH] Install CI llvm into the library directory --- src/bootstrap/dist.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 514be9e6864ba..9b77e38a8474f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -2358,7 +2358,7 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir } if let Some(config) = builder.config.target_config.get(&target) { - if config.llvm_config.is_some() { + if config.llvm_config.is_some() && !builder.config.llvm_from_ci { // If the LLVM was externally provided, then we don't currently copy // artifacts into the sysroot. This is not necessarily the right // choice (in particular, it will require the LLVM dylib to be in @@ -2369,6 +2369,9 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir // with the wrong files and isn't what distributions want. // // This behavior may be revisited in the future though. + // + // If the LLVM is coming from ourselves (just from CI) though, we + // still want to install it, as it otherwise won't be available. return; } }