Unverified Commit 6adeabc4 authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #329205 from reckenrode/gcc-aarch64-darwin-fixes 

gcc{10,12}: fix builds on aarch64-darwin
parents aba92693 a3341d69

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

+8 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ in 
  }) ];

  "12" = [ (fetchurl {

    name = "gcc-12-darwin-aarch64-support.patch";

    url = "https://raw.githubusercontent.com/Homebrew/formula-patches/f1188b90d610e2ed170b22512ff7435ba5c891e2/gcc/gcc-12.3.0.diff";

    sha256 = "sha256-naL5ZNiurqfDBiPSU8PTbTmLqj25B+vjjiqc4fAFgYs=";

    url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff";

    sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw=";

  }) ];

  "11" = [ (fetchpatch {

    # There are no upstream release tags in https://github.com/iains/gcc-11-branch.
@@ -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.

    # d04fe55 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...gcc-10-5Dr0-pre-0.diff";

    hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";

  }) ];

}.${majorVersion} or [])