Skip to content

Commit 0517934

Browse files
committed
gcc14: fix build on aarch64-darwin
The previous patch didn't apply anymore for 14.3.0. Currently there is no branch for 14.3.0 in https://github.com/iains/gcc-14-branch nor in homebrew. This lead me to use the -pre branch with a custom target.
1 parent 70ae81b commit 0517934

File tree

2 files changed

+5
-193
lines changed

2 files changed

+5
-193
lines changed

pkgs/development/compilers/gcc/patches/14/fixup-gcc-14-darwin-aarch64-support.patch

Lines changed: 0 additions & 181 deletions
This file was deleted.

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,20 +185,13 @@ in
185185
];
186186
"14" = [
187187
(fetchpatch {
188+
# There are no upstream release tags nor a static branch for 14.3.0 in https://github.com/iains/gcc-14-branch.
189+
# aa4cd614456de65ee3417acb83c6cff0640144e9 is the merge base of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0 and https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.3.0
190+
# 3e1d48d240f4aa5223c701b5c231c66f66ab1126 is the newest commit of https://github.com/iains/gcc-14-branch/tree/gcc-14-3-darwin-pre-0
188191
name = "gcc-14-darwin-aarch64-support.patch";
189-
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/41fdb9d5ec21fc8165cd4bee89bd23d0c90572ee/gcc/gcc-14.2.0-r2.diff";
190-
# The patch is based on 14.2.0, but we use a GCC snapshot. We
191-
# exclude the files with conflicts and apply our own merged patch
192-
# to avoid vendoring the entire huge patch in‐tree.
193-
excludes = [
194-
"gcc/config/aarch64/aarch64-tune.md"
195-
"gcc/config/darwin.h"
196-
"libgcc/config.host"
197-
"libgcc/config/t-darwin-min-11"
198-
];
199-
hash = "sha256-E4zEKm4tMhovOJKc1/FXZCLQvA+Jt5SC0O2C6SEvZjI=";
192+
url = "https://github.com/iains/gcc-14-branch/compare/aa4cd614456de65ee3417acb83c6cff0640144e9..3e1d48d240f4aa5223c701b5c231c66f66ab1126.diff";
193+
hash = "sha256-BSTSYnkBJBEm++mGerVVyaCUC4dUyXq0N1tqbk25bO4=";
200194
})
201-
./14/fixup-gcc-14-darwin-aarch64-support.patch
202195
];
203196
"13" = [
204197
(fetchpatch {

0 commit comments

Comments
 (0)