From fcaa5a7556760d520dc78d99ada5a58fc13c7894 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 01:40:31 -0700 Subject: [PATCH] libgcc: take from gcc unless explicitly overridden --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b6f36b8d2af..7314a8c9f89a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18911,9 +18911,7 @@ with pkgs; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = callPackage ../development/libraries/gcc/libgcc { - stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems - }; + libgcc = stdenv.cc.cc.libgcc or null; # This is for e.g. LLVM libraries on linux. gccForLibs =