git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127875 from misuzu/binutils-armv7l-native-fix

binutils: apply R_ARM_COPY.patch only when cross-compiling to armv7l

commitdb6e089456cdddcd7e2c1d8dac37a505c797e8fa authorJohn Ericson <git@JohnEricson.me> dateTue 29 Jun 2021, 10:40 (5 years ago) parented1adb45aad70e
1 file changed+1−1
pkgs/development/tools/misc/binutils/default.nix+1−1
pkgs/development/tools/misc/binutils/default.nix+1−1
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
7070 # indeed GHC will refuse to compile with a binutils suffering from it. See
7171 # this comment for more information:
7272 # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333
73− lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch;
73+ lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch;
7474
7575 outputs = [ "out" "info" "man" ];
7676