Merge pull request #228473 from wegank/gccgo-fix

gccgo: fix build

Changed files
+2 -2
pkgs
development
compilers
+1 -1
pkgs/development/compilers/gcc/common/configure-flags.nix
···
buildPlatform hostPlatform targetPlatform;
# See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903
-
disableBootstrap' = disableBootstrap && !langFortran;
+
disableBootstrap' = disableBootstrap && !langFortran && !langGo;
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+1 -1
pkgs/development/compilers/gcc/common/libgcc.nix
···
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
# This is a separate phase because gcc assembles its phase scripts
# in bash instead of nix (we should fix that).
-
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ];
+
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
preFixupLibGccPhase =
# delete extra/unused builds of libgcc_s in non-langC builds
# (i.e. libgccjit, gnat, etc) to avoid potential confusion