alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

GCC 4.5: Handle cross-glibc's propagated build inputs.

Browse source 
svn path=/nixpkgs/trunk/; revision=21907
This commit is contained in:
Ludovic Courtès 2010-05-19 21:32:31 +00:00
parent ed19699d1f
commit 882ff5a41b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/gcc-4.5/default.nix
View file

@ -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")