OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install CI llvm into the library directory

Browse Source
This commit is contained in:
Mark Rousskov 2020-11-15 08:59:53 -05:00
parent 0468845924
commit 4feaa35f39
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bootstrap/dist.rs
View File

@ -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 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 // If the LLVM was externally provided, then we don't currently copy
// artifacts into the sysroot. This is not necessarily the right // artifacts into the sysroot. This is not necessarily the right
// choice (in particular, it will require the LLVM dylib to be in // 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. // with the wrong files and isn't what distributions want.
// //
// This behavior may be revisited in the future though. // 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; return;
} }
} }