From 46e5ea5af6474a7c5f841fcdb516de64b98995fe Mon Sep 17 00:00:00 2001 From: David Truby Date: Tue, 28 Jul 2020 16:26:12 +0100 Subject: [PATCH] llvm*: remove symlinks to llvm-diff, llvm-as and associated LLVM IR utilities. These llvm-prefixed utilities are not drop-in replacements for the utilities with similar names, they are specifically for operating on LLVM IR files. Symlinking these without the prefix causes incompatibilities with tools that expect diff, as and others to behave normally. --- pkgs/development/compilers/llvm/10/bintools.nix | 1 - pkgs/development/compilers/llvm/7/bintools.nix | 1 - pkgs/development/compilers/llvm/8/bintools.nix | 1 - pkgs/development/compilers/llvm/9/bintools.nix | 1 - 4 files changed, 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/bintools.nix b/pkgs/development/compilers/llvm/10/bintools.nix index 72a2a733193..260cdfa081e 100644 --- a/pkgs/development/compilers/llvm/10/bintools.nix +++ b/pkgs/development/compilers/llvm/10/bintools.nix @@ -11,7 +11,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done rm -f $out/bin/${prefix}cat diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/pkgs/development/compilers/llvm/7/bintools.nix index 72a2a733193..260cdfa081e 100644 --- a/pkgs/development/compilers/llvm/7/bintools.nix +++ b/pkgs/development/compilers/llvm/7/bintools.nix @@ -11,7 +11,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done rm -f $out/bin/${prefix}cat diff --git a/pkgs/development/compilers/llvm/8/bintools.nix b/pkgs/development/compilers/llvm/8/bintools.nix index 72a2a733193..260cdfa081e 100644 --- a/pkgs/development/compilers/llvm/8/bintools.nix +++ b/pkgs/development/compilers/llvm/8/bintools.nix @@ -11,7 +11,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done rm -f $out/bin/${prefix}cat diff --git a/pkgs/development/compilers/llvm/9/bintools.nix b/pkgs/development/compilers/llvm/9/bintools.nix index 72a2a733193..260cdfa081e 100644 --- a/pkgs/development/compilers/llvm/9/bintools.nix +++ b/pkgs/development/compilers/llvm/9/bintools.nix @@ -11,7 +11,6 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' ln -s $prog $out/bin/${prefix}$(basename $prog) done for prog in ${llvm}/bin/*; do - ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") ln -sf $prog $out/bin/${prefix}$(basename $prog) done rm -f $out/bin/${prefix}cat