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 = ''