mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
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
This commit is contained in:
parent
d75e47a383
commit
b724fa3d44
2 changed files with 4 additions and 0 deletions
|
@ -231,6 +231,9 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then
|
||||||
if test -n "$NIX_LIB64_IN_SELF_RPATH"; then
|
if test -n "$NIX_LIB64_IN_SELF_RPATH"; then
|
||||||
export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
|
export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
|
if test -n "$NIX_LIB32_IN_SELF_RPATH"; then
|
||||||
|
export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ rec {
|
||||||
export NIX_ENFORCE_PURITY=1
|
export NIX_ENFORCE_PURITY=1
|
||||||
havePatchELF=1
|
havePatchELF=1
|
||||||
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
|
${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 ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue