Unverified Commit d27f79a2 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #228473 from wegank/gccgo-fix 

gccgo: fix build
parents fbd67ea6 5378f9a6

pkgs/development/compilers/gcc/common/configure-flags.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ let 
    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";

pkgs/development/compilers/gcc/common/libgcc.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ in 
  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