nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228473 from wegank/gccgo-fix

Browse Source 
gccgo: fix build
This commit is contained in:
Weijia Wang 2023-04-27 11:51:43 +03:00 committed by GitHub
commit d27f79a28f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@ -45,7 +45,7 @@ let
buildPlatform hostPlatform targetPlatform; buildPlatform hostPlatform targetPlatform;
# See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903 # See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903
disableBootstrap' = disableBootstrap && !langFortran; disableBootstrap' = disableBootstrap && !langFortran && !langGo;
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";

2
pkgs/development/compilers/gcc/common/libgcc.nix
View File

@ -12,7 +12,7 @@ in
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ]; outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
# This is a separate phase because gcc assembles its phase scripts # This is a separate phase because gcc assembles its phase scripts
# in bash instead of nix (we should fix that). # in bash instead of nix (we should fix that).
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ]; preFixupPhases = (previousAttrs.preFixupPhases or []) ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
preFixupLibGccPhase = preFixupLibGccPhase =
# delete extra/unused builds of libgcc_s in non-langC builds # delete extra/unused builds of libgcc_s in non-langC builds
# (i.e. libgccjit, gnat, etc) to avoid potential confusion # (i.e. libgccjit, gnat, etc) to avoid potential confusion