Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

llvmPackages.bintools-unwrapped: use targetPrefix for variable name like binutils does

and run nixpkgs-fmt

Artturin 627bb740 91089054

+36 -33
+36 -33
pkgs/development/compilers/llvm/common/bintools.nix
··· 1 1 { lib, runCommand, stdenv, llvm, lld, version, release_version }: 2 2 3 3 let 4 - prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; 5 - in runCommand "llvm-binutils-${version}" { 4 + targetPrefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; 5 + in 6 + runCommand "llvm-binutils-${version}" 7 + { 6 8 preferLocalBuild = true; 7 9 passthru = { 8 10 isLLVM = true; 9 11 }; 10 - } ('' 11 - mkdir -p $out/bin 12 - for prog in ${lld}/bin/*; do 13 - ln -s $prog $out/bin/${prefix}$(basename $prog) 14 - done 15 - for prog in ${llvm}/bin/*; do 16 - ln -sf $prog $out/bin/${prefix}$(basename $prog) 17 - done 12 + } 13 + ('' 14 + mkdir -p $out/bin 15 + for prog in ${lld}/bin/*; do 16 + ln -s $prog $out/bin/${targetPrefix}$(basename $prog) 17 + done 18 + for prog in ${llvm}/bin/*; do 19 + ln -sf $prog $out/bin/${targetPrefix}$(basename $prog) 20 + done 18 21 19 - llvmBin="${llvm}/bin" 22 + llvmBin="${llvm}/bin" 20 23 21 - ln -s $llvmBin/llvm-ar $out/bin/${prefix}ar 22 - ln -s $llvmBin/llvm-ar $out/bin/${prefix}dlltool 23 - ln -s $llvmBin/llvm-ar $out/bin/${prefix}ranlib 24 - ln -s $llvmBin/llvm-cxxfilt $out/bin/${prefix}c++filt 25 - ln -s $llvmBin/llvm-dwp $out/bin/${prefix}dwp 26 - ln -s $llvmBin/llvm-nm $out/bin/${prefix}nm 27 - ln -s $llvmBin/llvm-objcopy $out/bin/${prefix}objcopy 28 - ln -s $llvmBin/llvm-objcopy $out/bin/${prefix}strip 29 - ln -s $llvmBin/llvm-objdump $out/bin/${prefix}objdump 30 - ln -s $llvmBin/llvm-readobj $out/bin/${prefix}readelf 31 - ln -s $llvmBin/llvm-size $out/bin/${prefix}size 32 - ln -s $llvmBin/llvm-strings $out/bin/${prefix}strings 33 - ln -s $llvmBin/llvm-symbolizer $out/bin/${prefix}addr2line 24 + ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ar 25 + ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}dlltool 26 + ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ranlib 27 + ln -s $llvmBin/llvm-cxxfilt $out/bin/${targetPrefix}c++filt 28 + ln -s $llvmBin/llvm-dwp $out/bin/${targetPrefix}dwp 29 + ln -s $llvmBin/llvm-nm $out/bin/${targetPrefix}nm 30 + ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}objcopy 31 + ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}strip 32 + ln -s $llvmBin/llvm-objdump $out/bin/${targetPrefix}objdump 33 + ln -s $llvmBin/llvm-readobj $out/bin/${targetPrefix}readelf 34 + ln -s $llvmBin/llvm-size $out/bin/${targetPrefix}size 35 + ln -s $llvmBin/llvm-strings $out/bin/${targetPrefix}strings 36 + ln -s $llvmBin/llvm-symbolizer $out/bin/${targetPrefix}addr2line 34 37 35 - if [ -e "$llvmBin/llvm-debuginfod" ]; then 36 - ln -s $llvmBin/llvm-debuginfod $out/bin/${prefix}debuginfod 37 - ln -s $llvmBin/llvm-debuginfod-find $out/bin/${prefix}debuginfod-find 38 - fi 38 + if [ -e "$llvmBin/llvm-debuginfod" ]; then 39 + ln -s $llvmBin/llvm-debuginfod $out/bin/${targetPrefix}debuginfod 40 + ln -s $llvmBin/llvm-debuginfod-find $out/bin/${targetPrefix}debuginfod-find 41 + fi 39 42 40 - ln -s ${lld}/bin/lld $out/bin/${prefix}ld 43 + ln -s ${lld}/bin/lld $out/bin/${targetPrefix}ld 41 44 42 - # Only >=13 show GNU windres compatible in help 43 - '' + lib.optionalString (lib.versionAtLeast release_version "13") '' 44 - ln -s $llvmBin/llvm-rc $out/bin/${prefix}windres 45 - '') 45 + # Only >=13 show GNU windres compatible in help 46 + '' + lib.optionalString (lib.versionAtLeast release_version "13") '' 47 + ln -s $llvmBin/llvm-rc $out/bin/${targetPrefix}windres 48 + '')