Use llvm-as bundles with rustc as assembler

rust-lang · Oct 7, 2023 · 0e018d1 · 0e018d1
1 parent b49a0ae
commit 0e018d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 31 deletions.
diff --git a/src/global_asm.rs b/src/global_asm.rs
@@ -94,7 +94,19 @@ impl GlobalAsmConfig {
 
         GlobalAsmConfig {
             asm_enabled,
-            assembler: crate::toolchain::get_toolchain_binary(tcx.sess, "as"),
+            assembler: rustc_session::filesearch::sysroot_candidates()
+                .into_iter()
+                .map(|sysroot| {
+                    sysroot
+                        .join(rustc_target::target_rustlib_path(
+                            &sysroot,
+                            &rustc_session::config::host_triple(),
+                        ))
+                        .join("bin")
+                        .join("llvm-as")
+                })
+                .find(|path| path.exists())
+                .expect("no llvm-as"), // TODO nicer error
             output_filenames: tcx.output_filenames(()).clone(),
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -68,7 +68,6 @@ mod num;
 mod optimize;
 mod pointer;
 mod pretty_clif;
-mod toolchain;
 mod trap;
 mod unsize;
 mod value_and_place;

diff --git a/src/toolchain.rs b/src/toolchain.rs