Rollup merge of rust-lang#102176 - ojeda:add-llvm-dis-to-ci-llvm, r=Mark-Simulacrum

matthiaskrgr · web-flow · commit 0cd345c24742 · 2022-09-24T07:38:56.000+02:00
Add `llvm-dis` to the set of tools in `ci-llvm` The LLVM disassembler is needed for the test introduced in rust-lang#97550. Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -2026,6 +2026,7 @@ impl Step for RustDev {`
`2026`	`2026`	`"llvm-dwp",`
`2027`	`2027`	`"llvm-nm",`
`2028`	`2028`	`"llvm-dwarfdump",`
	`2029`	`+ "llvm-dis",`
`2029`	`2030`	`] {`
`2030`	`2031`	`tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755);`
`2031`	`2032`	`}`