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

* Add $pkg/lib64 (if it exists) to the library search path in addition

Browse Source 
to $pkg/lib.

svn path=/nixpkgs/trunk/; revision=6820
This commit is contained in:
Eelco Dolstra 2006-10-24 13:50:21 +00:00
parent a6d3ed3074
commit 361cf08c59
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/gcc-wrapper/builder.sh
View File

@ -22,6 +22,9 @@ if test -n "$nativeTools"; then
gccPath="$nativePrefix/bin" gccPath="$nativePrefix/bin"
ldPath="$nativePrefix/bin" ldPath="$nativePrefix/bin"
else else
if test -e "$gcc/lib64"; then
ldflags="$ldflags -L$gcc/lib64"
fi
ldflags="$ldflags -L$gcc/lib" ldflags="$ldflags -L$gcc/lib"
gccPath="$gcc/bin" gccPath="$gcc/bin"
ldPath="$binutils/bin" ldPath="$binutils/bin"

4
pkgs/build-support/gcc-wrapper/setup-hook.sh
View File

@ -3,6 +3,10 @@ addCVars () {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
fi fi
if test -d $1/lib64; then
export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
fi
if test -d $1/lib; then if test -d $1/lib; then
export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
fi fi