Skip to content

Package more llvm-* tools in the rust-dev component, for run-make-fulldeps tests #78131

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.

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

Merged
merged 2 commits into from
Oct 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,9 @@ def download_stage0(self):
llvm_sha = subprocess.check_output([
"git", "log", "--author=bors", "--format=%H", "-n1",
"-m", "--first-parent",
"--", "src/llvm-project"
"--",
"src/llvm-project",
"src/bootstrap/download-ci-llvm-stamp",
]).decode(sys.getdefaultencoding()).strip()
llvm_assertions = self.get_toml('assertions', 'llvm') == 'true'
if self.program_out_of_date(self.llvm_stamp(), llvm_sha + str(llvm_assertions)):
Expand Down
11 changes: 9 additions & 2 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2538,8 +2538,15 @@ impl Step for RustDev {
let dst_bindir = image.join("bin");
t!(fs::create_dir_all(&dst_bindir));

let exe = builder.llvm_out(target).join("bin").join(exe("llvm-config", target));
builder.install(&exe, &dst_bindir, 0o755);
let src_bindir = builder.llvm_out(target).join("bin");
let install_bin =
|name| builder.install(&src_bindir.join(exe(name, target)), &dst_bindir, 0o755);
install_bin("llvm-config");
install_bin("llvm-ar");
install_bin("llvm-objdump");
install_bin("llvm-profdata");
install_bin("llvm-bcanalyzer");
install_bin("llvm-cov");
builder.install(&builder.llvm_filecheck(target), &dst_bindir, 0o755);

// Copy the include directory as well; needed mostly to build
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap/download-ci-llvm-stamp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Change this file to make users of the `download-ci-llvm` configuration download
a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.

Last change is for: https://github.com/rust-lang/rust/pull/78131