dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #54018 - alexcrichton:omg-fix-again, r=Mark-Simulacrum 

Ship libLLVM.dylib on OSX

Previously we just weren't shipping this at all as we were only looking for the
Linux version!
This commit is contained in:
bors 2018-09-07 04:18:07 +00:00
parent 9804689b58 bd1fb60133
commit 2ae11a9c22
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bootstrap/dist.rs
View File

@ -1902,6 +1902,16 @@ fn maybe_install_llvm_dylib(builder: &Builder,
let src_libdir = builder
.llvm_out(target)
.join("lib");
let dst_libdir = image.join("lib/rustlib").join(&*target).join("lib");
t!(fs::create_dir_all(&dst_libdir));
if target.contains("apple-darwin") {
let llvm_dylib_path = src_libdir.join("libLLVM.dylib");
if llvm_dylib_path.exists() {
builder.install(&llvm_dylib_path, &dst_libdir, 0o644);
}
return
}
// Usually libLLVM.so is a symlink to something like libLLVM-6.0.so.
// Since tools link to the latter rather than the former, we have to
@ -1913,8 +1923,6 @@ fn maybe_install_llvm_dylib(builder: &Builder,
llvm_dylib_path.display(), e);
});
let dst_libdir = image.join("lib/rustlib").join(&*target).join("lib");
t!(fs::create_dir_all(&dst_libdir));
builder.install(&llvm_dylib_path, &dst_libdir, 0o644);
}