Author: viric
Date: Sun Aug 8 18:53:00 2010
New Revision: 23044
URL: https://svn.nixos.org/websvn/nix/?rev=23044&sc=1
Log:
Adding support for the /lib32 (there was /lib and /lib64 only), for the n32 ABI
in mips I'm
making the longsoon2f system for.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Sun Aug
8 18:52:21 2010 (r23043)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Sun Aug
8 18:53:00 2010 (r23044)
@@ -231,6 +231,9 @@
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
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Sun Aug
8 18:52:21 2010 (r23043)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Sun Aug
8 18:53:00 2010 (r23044)
@@ -23,6 +23,7 @@
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 ""}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
