From a360198627e363428bf3b1b65a7a1ed05aa22e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Dec 2010 17:35:34 +0000 Subject: [PATCH] Fixing the gcc postPatch, for the static stage of the cross-compiler svn path=/nixpkgs/branches/stdenv-updates/; revision=25215 --- pkgs/development/compilers/gcc-4.5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 77e3cbfa3ed2..19efa57af8ee 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if cross != null then libcCross else stdenv.gcc.libc; + libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h