diff options
| author | misuzu <bakalolka@gmail.com> | 2021-06-23 11:29:41 +0300 |
|---|---|---|
| committer | misuzu <bakalolka@gmail.com> | 2021-06-23 11:37:40 +0300 |
| commit | 5aad70e8beb98a1c855facea5c9749f644e8b897 (patch) | |
| tree | 637cfb1dfb181f3d41123027c832a6b828ad5875 | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar.gz nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar.bz2 nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar.lz nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar.xz nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.tar.zst nixpkgs-5aad70e8beb98a1c855facea5c9749f644e8b897.zip | |
binutils: apply R_ARM_COPY.patch only when cross-compiling to armv7l
Applying R_ARM_COPY.patch when not cross-compiling breaks native armv7l builds.
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8042655a859..a4233886a85 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { # indeed GHC will refuse to compile with a binutils suffering from it. See # this comment for more information: # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch; + lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch; outputs = [ "out" "info" "man" ]; |