Unverified Commit 151776fb authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

gcc10: enable build on aarch64-darwin

parent ce516050

pkgs/development/compilers/gcc/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ pipe ((callFile ./common/builder.nix {}) ({ 
      if (is8 && targetPlatform.isAvr) then []

      else if !(is48 || is49) then [ "aarch64-darwin" ]

      else platforms.darwin;

  } // optionalAttrs is11 {

  } // optionalAttrs is10 {

    badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];

  };

} // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {

pkgs/development/compilers/gcc/patches/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ in 
    url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff";

    hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4=";

  }) ];

  "10" = [ (fetchpatch {

      # There are no upstream release tags in https://github.com/iains/gcc-10-branch.

      # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0

      url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...a61e86820ed213edffa3bb246e9d263e3c7828d5.diff";

      hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";

    }) ];

}.${majorVersion} or [])