From 7f4280c53866a3febad623d669db7eb2adea876d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 3 May 2023 09:54:47 +0000 Subject: [PATCH] pkgsStatic.gcc: fix build There's no libgcc.so in a static-only build. --- pkgs/development/compilers/gcc/common/libgcc.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index 312525dcf88f..422239262b75 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -6,7 +6,11 @@ }: let - enableLibGccOutput = (with stdenv; targetPlatform == hostPlatform) && !langJit && !stdenv.hostPlatform.isDarwin; + enableLibGccOutput = + (with stdenv; targetPlatform == hostPlatform) && + !langJit && + !stdenv.hostPlatform.isDarwin && + !stdenv.hostPlatform.isStatic; in (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) { outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];