From cde2dbab8159959de3fb90ff6cd690d7b2ac469b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 29 Sep 2025 20:42:13 -0300 Subject: [PATCH] gcc: fix cygwin build --- pkgs/development/compilers/gcc/common/libgcc.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index ead87e5e6630..c9f6a7793344 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -53,10 +53,9 @@ lib.pipe drv useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc; enableLibGccOutput = - ( - !(stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isCygwin) - || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform) - ) + # $libgcc logic is currently hardcoded for .so + !stdenv.hostPlatform.isPE + && !stdenv.targetPlatform.isPE && !langJit && !stdenv.hostPlatform.isDarwin && enableShared