mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #78131 - SimonSapin:ar, r=Mark-Simulacrum

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

Fixes https://github.com/rust-lang/rust/issues/78110
This commit is contained in:
bors 2020-10-22 04:40:06 +00:00
commit 8f0fa9d51f
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View File

@ -435,7 +435,9 @@ class RustBuild(object):
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)):

11
src/bootstrap/dist.rs
View File

@ -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

4
src/bootstrap/download-ci-llvm-stamp Normal file
View File

@ -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