From 15aa32e082124e37587b5fb250598a7019694500 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 3 May 2022 15:11:15 -0400 Subject: [PATCH] llvm-bintools: passthru targetPrefix. This is expected e.g. by the GHC cross-compilation code --- pkgs/development/compilers/llvm/13/bintools/default.nix | 8 +++++++- pkgs/development/compilers/llvm/14/bintools/default.nix | 8 +++++++- pkgs/development/compilers/llvm/git/bintools/default.nix | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index 4c16957aeb4..dcdad1af46f 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -5,7 +5,13 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru.isLld = true; } ('' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLld = true; + targetPrefix = prefix; + }; +} ('' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index 4c16957aeb4..dcdad1af46f 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -5,7 +5,13 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru.isLld = true; } ('' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLld = true; + targetPrefix = prefix; + }; +} ('' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 4c16957aeb4..dcdad1af46f 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -5,7 +5,13 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru.isLld = true; } ('' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLld = true; + targetPrefix = prefix; + }; +} ('' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog)