diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-24 13:50:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-24 13:50:21 +0000 |
| commit | 361cf08c59cc49079c9528489a6cac04704b7f12 (patch) | |
| tree | e4cdd87af2adfd22e72f352e4e40d117fafe6297 | |
| parent | a6d3ed3074219da2030194e01a2cfd93fbf9073a (diff) | |
| download | nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar.gz nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar.bz2 nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar.lz nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar.xz nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.tar.zst nixlib-361cf08c59cc49079c9528489a6cac04704b7f12.zip | |
* Add $pkg/lib64 (if it exists) to the library search path in addition
to $pkg/lib. svn path=/nixpkgs/trunk/; revision=6820
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/setup-hook.sh | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index e8dd5fa277f9..b9a811dd7471 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -22,6 +22,9 @@ if test -n "$nativeTools"; then gccPath="$nativePrefix/bin" ldPath="$nativePrefix/bin" else + if test -e "$gcc/lib64"; then + ldflags="$ldflags -L$gcc/lib64" + fi ldflags="$ldflags -L$gcc/lib" gccPath="$gcc/bin" ldPath="$binutils/bin" diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index 7a7ea8226919..1739d8dcae53 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -3,6 +3,10 @@ addCVars () { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include" fi + if test -d $1/lib64; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + fi + if test -d $1/lib; then export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" fi |