From a5e136325868d6439b405dffbe782f5abbd0ee1a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Jan 2023 22:40:38 +0000 Subject: [PATCH] llvmPackages.bintools: remove as -> llvm-as symlink "llvm-as is an LLVM IR -> LLVM bitcode assembler not a system assembler"[1], and therefore should not be linked as "as". The "as" symlink was removed in 46e5ea5af64 ("llvm*: remove symlinks to llvm-diff, llvm-as and associated LLVM IR utilities."), but that was partially reverted by b331c72f032 ("llvm: setup some symlinks for compatibility with binutils"), which restored a bunch of symlinks that were incorrectly removed, but also incorrectly restored "as". This was pointed out[2] at the time but apparently never fixed. [1]: https://github.com/NixOS/nixpkgs/issues/93523#issue-661663683 [2]: https://github.com/NixOS/nixpkgs/commit/b331c72f032389c7156ff1d30117f91c95bbeedb#commitcomment-40981705 --- pkgs/development/compilers/llvm/10/bintools/default.nix | 1 - pkgs/development/compilers/llvm/11/bintools/default.nix | 1 - pkgs/development/compilers/llvm/12/bintools/default.nix | 1 - pkgs/development/compilers/llvm/13/bintools/default.nix | 1 - pkgs/development/compilers/llvm/14/bintools/default.nix | 1 - pkgs/development/compilers/llvm/7/bintools/default.nix | 1 - pkgs/development/compilers/llvm/8/bintools/default.nix | 1 - pkgs/development/compilers/llvm/9/bintools/default.nix | 1 - pkgs/development/compilers/llvm/git/bintools/default.nix | 1 - 9 files changed, 9 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/bintools/default.nix b/pkgs/development/compilers/llvm/10/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/11/bintools/default.nix b/pkgs/development/compilers/llvm/11/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/12/bintools/default.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index f13fe94f649c..13223f051be7 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index f13fe94f649c..13223f051be7 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/7/bintools/default.nix b/pkgs/development/compilers/llvm/7/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/8/bintools/default.nix b/pkgs/development/compilers/llvm/8/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/9/bintools/default.nix b/pkgs/development/compilers/llvm/9/bintools/default.nix index d46c1045eb04..a9d4f5fffc09 100644 --- a/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 3f510f231a34..6a12d776aca1 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -17,7 +17,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib - ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt ln -s ${llvm}/bin/llvm-debuginfod $out/bin/${prefix}debuginfod ln -s ${llvm}/bin/llvm-debuginfod-find $out/bin/${prefix}debuginfod-find