gcc15: update patches for 15 version (#411025)
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
--- a/libgcc/config.host
|
||||
+++ b/libgcc/config.host
|
||||
@@ -239,7 +239,7 @@ case ${host} in
|
||||
x86_64-*-darwin2[0-2]*)
|
||||
tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
|
||||
;;
|
||||
- *-*-darwin2*)
|
||||
+ *-*-darwin2* | *-*-darwin)
|
||||
tmake_file="t-darwin-min-11 $tmake_file"
|
||||
;;
|
||||
*-*-darwin1[89]*)
|
||||
@@ -27,11 +27,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
atLeast15 = lib.versionAtLeast version "15";
|
||||
atLeast14 = lib.versionAtLeast version "14";
|
||||
atLeast13 = lib.versionAtLeast version "13";
|
||||
atLeast12 = lib.versionAtLeast version "12";
|
||||
atLeast11 = lib.versionAtLeast version "11";
|
||||
atLeast10 = lib.versionAtLeast version "10";
|
||||
is15 = majorVersion == "15";
|
||||
is14 = majorVersion == "14";
|
||||
is13 = majorVersion == "13";
|
||||
is12 = majorVersion == "12";
|
||||
@@ -150,8 +152,11 @@ in
|
||||
|
||||
# Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64.
|
||||
++ optional (
|
||||
atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
|
||||
is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
|
||||
) ../patches/14/libgcc-darwin-detection.patch
|
||||
++ optional (
|
||||
atLeast15 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
|
||||
) ../patches/15/libgcc-darwin-detection.patch
|
||||
|
||||
# Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin
|
||||
++ optional (
|
||||
@@ -166,6 +171,7 @@ in
|
||||
# Use absolute path in GNAT dylib install names on Darwin
|
||||
++ optionals (stdenv.hostPlatform.isDarwin && langAda) (
|
||||
{
|
||||
"15" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ];
|
||||
"14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ];
|
||||
"13" = [ ./gnat-darwin-dylib-install-name-13.patch ];
|
||||
"12" = [ ./gnat-darwin-dylib-install-name.patch ];
|
||||
@@ -175,6 +181,13 @@ in
|
||||
|
||||
++ optionals canApplyIainsDarwinPatches (
|
||||
{
|
||||
"15" = [
|
||||
(fetchpatch {
|
||||
name = "gcc-15-darwin-aarch64-support.patch";
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a25079204c1cb3d78ba9dd7dd22b8aecce7ce264/gcc/gcc-15.1.0.diff";
|
||||
sha256 = "sha256-MJxSGv6LEP1sIM8cDqbmfUV7byV0bYgADeIBY/Teyu8=";
|
||||
})
|
||||
];
|
||||
"14" = [
|
||||
(fetchpatch {
|
||||
name = "gcc-14-darwin-aarch64-support.patch";
|
||||
|
||||
Reference in New Issue
Block a user