about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-09-24 07:38:56 +0200
committerGitHub <noreply@github.com>2022-09-24 07:38:56 +0200
commit0cd345c24742b1a5f34055c8f0ca87fcf59da6fc (patch)
treee8231c9b99d398334416621bbfb40e06c7683922
parent00dfc32cadbf0c971a976273843361d83012497b (diff)
parentcb8a9c496f037722378a36e4a0a54ccf9a7bb7c1 (diff)
downloadrust-0cd345c24742b1a5f34055c8f0ca87fcf59da6fc.tar.gz
rust-0cd345c24742b1a5f34055c8f0ca87fcf59da6fc.zip
Rollup merge of #102176 - ojeda:add-llvm-dis-to-ci-llvm, r=Mark-Simulacrum
Add `llvm-dis` to the set of tools in `ci-llvm`

The LLVM disassembler is needed for the test introduced in https://github.com/rust-lang/rust/pull/97550.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-rw-r--r--src/bootstrap/dist.rs1
-rw-r--r--src/bootstrap/download-ci-llvm-stamp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index e92c4669a24..563e67a326f 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -2026,6 +2026,7 @@ impl Step for RustDev {
             "llvm-dwp",
             "llvm-nm",
             "llvm-dwarfdump",
+            "llvm-dis",
         ] {
             tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755);
         }
diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp
index 19504a51a58..2e11cf19c3f 100644
--- a/src/bootstrap/download-ci-llvm-stamp
+++ b/src/bootstrap/download-ci-llvm-stamp
@@ -1,4 +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/96867
+Last change is for: https://github.com/rust-lang/rust/pull/97550