From da371c7c5a57a8a34c8bb3ec5336ff97977360de Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 8 Aug 2023 02:02:46 -0700 Subject: [PATCH] libgcc: use forceLibgccToBuildCrtStuff This duplicates (by reference) the two-line adjustment to libgcc's Makefile needed in order to get crtstuff to build without a full build of gcc. --- pkgs/development/libraries/gcc/libgcc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index d3f1ce2a27d6..929e7e47f17f 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -45,9 +45,11 @@ in stdenvNoLibs.mkDerivation (finalAttrs: { buildRoot=$(readlink -e "./build") ''; - postPatch = '' - sourceRoot=$(readlink -e "./libgcc") - ''; + postPatch = + gcc.cc.passthru.forceLibgccToBuildCrtStuff + + '' + sourceRoot=$(readlink -e "./libgcc") + ''; hardeningDisable = [ "pie" ];