From bc3dbc62d6882b32da646aff8c17f5d74d7c5a43 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 20 Oct 2020 09:14:27 +0200 Subject: [PATCH 1/2] Package more llvm-* tools in the rust-dev component, for run-make-fulldeps tests Fixes https://github.com/rust-lang/rust/issues/78110 --- src/bootstrap/dist.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 1887b805da1..6d2da0c0213 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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 From 99f99ca7ab34f2c3514291d3565d767d57e04081 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 20 Oct 2020 20:04:53 +0200 Subject: [PATCH 2/2] Make users of `download-ci-llvm` download a new version --- src/bootstrap/bootstrap.py | 4 +++- src/bootstrap/download-ci-llvm-stamp | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/bootstrap/download-ci-llvm-stamp diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index ce37adeb28c..7d3b4b13503 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -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)): diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp new file mode 100644 index 00000000000..d857618eefa --- /dev/null +++ b/src/bootstrap/download-ci-llvm-stamp @@ -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