diff options
| author | Shea Levy <shea@shealevy.com> | 2022-05-03 08:57:03 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2022-05-06 10:54:52 -0400 |
| commit | a73b59a157f149369283eda571b61f7990e6afa3 (patch) | |
| tree | 27a66cfd0c043dd04d777a9f7ef0d7be14b45487 | |
| parent | 4b503b2a58fd7776a497b1c0109f5de1eb76fdb4 (diff) | |
| download | nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar.gz nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar.bz2 nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar.lz nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar.xz nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.tar.zst nixpkgs-a73b59a157f149369283eda571b61f7990e6afa3.zip | |
llvm-bintools: Include aliases for windres and dlltool on Windows
3 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index 53f7941e336..e01e152d159 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/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 +'') diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index 53f7941e336..e01e152d159 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/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 +'') diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 53f7941e336..e01e152d159 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/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 +'') |