From 8221d5f4e75e5ccf1b5cb98d90cfdea115e2cdfc Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Aug 2023 22:48:21 -0700 Subject: [PATCH] gcc: resolve merge conflict from staging --- pkgs/development/compilers/gcc/patches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 1a9d7be539b2..76c6e876a0e8 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -75,14 +75,14 @@ optionals (is49 || is6) [ ] ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (atLeast6 && !atLeast12) ./fix-bug-80431.patch ++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (is10) ./11/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (targetPlatform != hostPlatform) ./libstdc++-target.patch ++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch ++ optional (noSysDirs) (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ++ optionals (is6 && langAda) [ ./gnat-cflags.patch ./6/gnat-glibc234.patch -] ++ optional (noSysDirs && atLeast10 && (is10 || (!atLeast12 -> hostPlatform.isRiscV))) ./no-sys-dirs-riscv.patch +] ++ optional (noSysDirs && atLeast10 && !atLeast13 && (is10 || (!atLeast12 -> hostPlatform.isRiscV))) ./no-sys-dirs-riscv.patch +++ optional (noSysDirs && is13) ./13/no-sys-dirs-riscv.patch ++ optional (noSysDirs && is9 && hostPlatform.isRiscV) ./no-sys-dirs-riscv-gcc9.patch ++ optionals (langAda || atLeast12) [ ./gnat-cflags-11.patch