public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #131554 from NixOS/backport-127875-to-release-21.05 

[Backport release-21.05] binutils: apply R_ARM_COPY.patch only when cross-compiling to armv7l
This commit is contained in:
Artturi 2021-08-09 01:11:30 +03:00 committed by GitHub
parent 8485c05212 fd5d487ef4
commit 9d5f7324c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation {
# indeed GHC will refuse to compile with a binutils suffering from it. See # indeed GHC will refuse to compile with a binutils suffering from it. See
# this comment for more information: # this comment for more information:
# https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 # 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" ]; outputs = [ "out" "info" "man" ];