From 5dc0870f6aafab36c6cc4d0165d96c51524ee7fb Mon Sep 17 00:00:00 2001
From: Richard Feldman <oss@rtfeldman.com>
Date: Mon, 7 Jun 2021 21:51:37 -0400
Subject: [PATCH] Use vanilla llvm-as

---
 compiler/build/src/program.rs | 2 +-
 compiler/builtins/build.rs    | 6 +-----
 nix/bin/llvm-as-12            | 2 --
 shell.nix                     | 7 -------
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100755 nix/bin/llvm-as-12

diff --git a/compiler/build/src/program.rs b/compiler/build/src/program.rs
index de8ba19374..1dc5156184 100644
--- a/compiler/build/src/program.rs
+++ b/compiler/build/src/program.rs
@@ -204,7 +204,7 @@ pub fn gen_from_mono_module(
         }
 
         // assemble the .ll into a .bc
-        let _ = Command::new("llvm-as-12")
+        let _ = Command::new("llvm-as")
             .env_clear()
             .args(&[
                 app_ll_dbg_file.to_str().unwrap(),
diff --git a/compiler/builtins/build.rs b/compiler/builtins/build.rs
index 7df5952d34..05f5aa284c 100644
--- a/compiler/builtins/build.rs
+++ b/compiler/builtins/build.rs
@@ -56,11 +56,7 @@ fn main() {
     let dest_bc = dest_bc_path.to_str().expect("Invalid dest bc path");
     println!("Compiling bitcode to: {}", dest_bc);
 
-    run_command(
-        build_script_dir_path,
-        "llvm-as-12",
-        &[dest_ir, "-o", dest_bc],
-    );
+    run_command(build_script_dir_path, "llvm-as", &[dest_ir, "-o", dest_bc]);
 
     get_zig_files(bitcode_path.as_path(), &|path| {
         let path: &Path = path;
diff --git a/nix/bin/llvm-as-12 b/nix/bin/llvm-as-12
deleted file mode 100755
index 65839a9b5a..0000000000
--- a/nix/bin/llvm-as-12
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-llvm-as "$@"
diff --git a/shell.nix b/shell.nix
index 28d9af7b5f..43dee8500f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -96,11 +96,4 @@ pkgs.mkShell
           ]
           ++ linuxInputs
         );
-
-    # Non Nix llvm installs names the bin llvm-as-${version}, so we
-    # alias `llvm` to `llvm-as-${version}` here.
-    # This the name of the file in nix/bin will need to be updated whenever llvm is updated
-    shellHook = ''
-      export PATH="$PATH:$PWD/nix/bin"
-    '';
   }