Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustbuild: Distribute libLLVM.so with rustc #53828

Merged
merged 1 commit into from
Aug 31, 2018
Merged

rustbuild: Distribute libLLVM.so with rustc #53828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/bootstrap/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,13 @@ impl Step for Rustc {
t!(fs::create_dir_all(&backends_dst));
builder.cp_r(&backends_src, &backends_dst);

// Copy libLLVM.so to the lib dir as well, if needed. While not
// technically needed by rustc itself it's needed by lots of other
// components like the llvm tools and LLD. LLD is included below and
// tools/LLDB come later, so let's just throw it in the rustc
// component for now.
maybe_install_llvm_dylib(builder, host, image);

// Copy over lld if it's there
if builder.config.lld_enabled {
let exe = exe("rust-lld", &compiler.host);
Expand Down Expand Up @@ -1967,8 +1974,6 @@ impl Step for LlvmTools {
builder.install(&exe, &dst_bindir, 0o755);
}

maybe_install_llvm_dylib(builder, target, &image);

// Prepare the overlay
let overlay = tmp.join("llvm-tools-overlay");
drop(fs::remove_dir_all(&overlay));
Expand Down Expand Up @@ -2087,9 +2092,6 @@ impl Step for Lldb {
}
}

// Copy libLLVM.so to the lib dir as well, if needed.
maybe_install_llvm_dylib(builder, target, &image);

// Prepare the overlay
let overlay = tmp.join("lldb-overlay");
drop(fs::remove_dir_all(&overlay));
Expand Down