From 882ff5a41b6e4db2ca15bf97b91eb1ba3dd79580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 May 2010 21:32:31 +0000 Subject: [PATCH] GCC 4.5: Handle cross-glibc's propagated build inputs. svn path=/nixpkgs/trunk/; revision=21907 --- pkgs/development/compilers/gcc-4.5/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index f5e4c67761e..62a4e01803d 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -37,6 +37,7 @@ assert langVhdl -> gnat != null; assert libelf != null -> zlib != null; with stdenv.lib; +with builtins; let version = "4.5.0"; javaEcj = fetchurl { @@ -215,7 +216,13 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross))); + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && + hasAttr "propagatedBuildInputs" libcCross) + libcCross.propagatedBuildInputs))); LIBRARY_PATH = concatStrings (intersperse ":" (map (x: x + "/lib")