From 6ea24aa5c3d8a8ca8cdde74e34d7f3b0d230acee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Jan 2026 07:57:17 +0100 Subject: [PATCH] gcc14: fixup build on aarch64-darwin https://hydra.nixos.org/build/317993814 Same for gfortran14 and perhaps other derivatives. This is a partial revert of 385a5e291736 from PR #461497 (with added comment to explain) --- pkgs/development/compilers/gcc/patches/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index d7eeee3eb739..84bdf1d93684 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -164,7 +164,10 @@ optionals noSysDirs ( ## Darwin # Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (is14 && stdenv.hostPlatform.isDarwin) ../patches/14/libgcc-darwin-detection.patch +++ optional ( + # this one would conflict with gcc-14-darwin-aarch64-support.patch + is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 +) ../patches/14/libgcc-darwin-detection.patch ++ optional (atLeast15 && stdenv.hostPlatform.isDarwin) ../patches/15/libgcc-darwin-detection.patch # Fix libgcc_s.1.dylib build on Darwin 11+ by not reexporting unwind symbols that don't exist