From 1c861818578cf221c4b9ccb35164871b00d9b235 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 Mar 2013 19:47:59 -0400 Subject: [PATCH] glibc-2.17: Don't link to stdenv.lib.gcc if it's null. This fixes the tarball Signed-off-by: Shea Levy --- pkgs/development/libraries/glibc/2.17/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index ea2f3b6d140..3006ff49013 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -143,7 +143,9 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" - makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib" + ${stdenv.lib.optionalString (stdenv.gcc.libc != null) + ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"'' + } ${preConfigure} '';