llvm-bintools: Include aliases for windres and dlltool on Windows

main
Shea Levy 2 years ago
parent 4b503b2a58
commit a73b59a157
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
  1. 9
      pkgs/development/compilers/llvm/13/bintools/default.nix
  2. 9
      pkgs/development/compilers/llvm/14/bintools/default.nix
  3. 9
      pkgs/development/compilers/llvm/git/bintools/default.nix

@ -1,11 +1,11 @@
{ runCommand, stdenv, llvm, lld, version }:
{ runCommand, stdenv, llvm, lld, version, lib }:
let
prefix =
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } (''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
@ -26,4 +26,7 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip
ln -s ${lld}/bin/lld $out/bin/${prefix}ld
''
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
ln -s ${llvm}/bin/llvm-windres $out/bin/${prefix}windres
ln -s ${llvm}/bin/llvm-dlltool $out/bin/${prefix}dlltool
'')

@ -1,11 +1,11 @@
{ runCommand, stdenv, llvm, lld, version }:
{ runCommand, stdenv, llvm, lld, version, lib }:
let
prefix =
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } (''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
@ -26,4 +26,7 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip
ln -s ${lld}/bin/lld $out/bin/${prefix}ld
''
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
ln -s ${llvm}/bin/llvm-windres $out/bin/${prefix}windres
ln -s ${llvm}/bin/llvm-dlltool $out/bin/${prefix}dlltool
'')

@ -1,11 +1,11 @@
{ runCommand, stdenv, llvm, lld, version }:
{ runCommand, stdenv, llvm, lld, version, lib }:
let
prefix =
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } (''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
@ -26,4 +26,7 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip
ln -s ${lld}/bin/lld $out/bin/${prefix}ld
''
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
ln -s ${llvm}/bin/llvm-windres $out/bin/${prefix}windres
ln -s ${llvm}/bin/llvm-dlltool $out/bin/${prefix}dlltool
'')

Loading…
Cancel
Save