public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCJ 4.4: Tell GCC about the path to the X libs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16500
This commit is contained in:
Ludovic Courtès 2009-07-29 08:48:09 +00:00
parent 8f6228ee5b
commit 0b235f3ec5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/gcc-4.4/builder.sh
View File

@ -48,8 +48,15 @@ if test "$noSysDirs" = "1"; then
export LIBRARY_PATH="$glibc_libdir" export LIBRARY_PATH="$glibc_libdir"
if test "$langJava" = "1"; then if test "$langJava" = "1"; then
export CPATH="$CPATH:$zlib/include:$boehmgc/include" for lib in "$zlib" "$boehmgc" "$libX11" "$libXt" "$libSM" \
export LIBRARY_PATH="$LIBRARY_PATH:$zlib/lib:$boehmgc/lib" "$libICE" "$libXtst"
do
if test -n "$lib"
then
export CPATH="$CPATH:$lib/include"
export LIBRARY_PATH="$LIBRARY_PATH:$lib/lib"
fi
done
fi fi
echo "setting \$CPATH to \`$CPATH'" echo "setting \$CPATH to \`$CPATH'"

3
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -101,7 +101,8 @@ stdenv.mkDerivation ({
"; ";
inherit gmp mpfr zlib boehmgc; inherit gmp mpfr zlib boehmgc;
inherit libX11 libXt libSM libICE libXtst;
passthru = { inherit langC langCC langFortran langTreelang enableMultilib; }; passthru = { inherit langC langCC langFortran langTreelang enableMultilib; };
meta = { meta = {