diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-08 18:53:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-08 18:53:00 +0000 |
| commit | b724fa3d447ecbe4b1fa6e327d8d529a33af69bd (patch) | |
| tree | d2b051cfdfe7c9ca85d68500bd7ffa17254a56e9 | |
| parent | d75e47a383fae75d5b673615859e94f26e92aeea (diff) | |
Adding support for the /lib32 (there was /lib and /lib64 only), for the n32 ABI in mips I'm
making the longsoon2f system for. svn path=/nixpkgs/branches/stdenv-updates/; revision=23044
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 948b6ca3ad667..ba06666ca8987 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -231,6 +231,9 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then if test -n "$NIX_LIB64_IN_SELF_RPATH"; then export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" fi + if test -n "$NIX_LIB32_IN_SELF_RPATH"; then + export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS" + fi fi diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bfeb01a7cd725..04009fd5bee68 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -23,6 +23,7 @@ rec { export NIX_ENFORCE_PURITY=1 havePatchELF=1 ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} + ${if system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} ''; |