From 7498f431c8bd2869ec6b90a62b532b09268c24c0 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 29 Dec 2024 18:40:29 +0000
Subject: [PATCH] glibc: avoid overriding makeFlags

fixes regression introduced in #357052
---
 pkgs/development/libraries/glibc/common.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 18fdb6859e27..4e2c245dddce 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -199,9 +199,13 @@ stdenv.mkDerivation (
       ]
       ++ lib.optional withGd "--with-gd";
 
-    makeFlags = (args.makeFlags or [ ]) ++ [
-      "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-    ];
+    makeFlags =
+      (args.makeFlags or [ ])
+      ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" ]
+      ++ lib.optionals (stdenv.cc.libc != null) [
+        "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"
+        "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"
+      ];
 
     postInstall =
       (args.postInstall or "")
@@ -269,11 +273,6 @@ stdenv.mkDerivation (
         inherit sha256;
       };
 
-      makeFlags = lib.optionals (stdenv.cc.libc != null) [
-        "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"
-        "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"
-      ];
-
       # Remove absolute paths from `configure' & co.; build out-of-tree.
       preConfigure =
         ''