diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-07-26 22:47:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-07-26 22:47:33 +0000 |
| commit | d4aedd92cc37de2cd8d5c5bc7520bfc433383fc2 (patch) | |
| tree | 298ff00968cbd6706cfcb2ee7f39479780fb10dd /pkgs/stdenv | |
| parent | 4f5e00f6860d2cd63fd6254801479bfe743274aa (diff) | |
I revert my changes to get nixpkgs working on armv5tel-linux.
I thought I didn't change stdenv, but I did. This will go soon into the stdenv branch then. Reverse-merging r16467 through r16465. svn path=/nixpkgs/trunk/; revision=16468
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh | 8 |
4 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 21ed84e93af72..7f44037c70190 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -54,7 +54,6 @@ rec { stdenv = if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else - if stdenvType == "armv5tel-linux" then stdenvNative else if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "i686-mingw" then stdenvMinGW else if stdenvType == "i686-darwin" then stdenvNix else diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f37e4a8b05d0e..1a1f588c16aa5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -71,8 +71,7 @@ let isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin"; isLinux = result.system == "i686-linux" || result.system == "x86_64-linux" - || result.system == "powerpc-linux" - || result.system == "armv5tel-linux"; + || result.system == "powerpc-linux"; isi686 = result.system == "i686-linux" || result.system == "i686-darwin" || result.system == "i686-freebsd"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a5231b2152791..b74258120b3ce 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -13,7 +13,6 @@ rec { if system == "i686-linux" then import ./bootstrap/i686 else if system == "x86_64-linux" then import ./bootstrap/x86_64 else if system == "powerpc-linux" then import ./bootstrap/powerpc - else if system == "armv5tel-linux" then import ./bootstrap/armv5tel else abort "unsupported platform for the pure Linux stdenv"; diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index f51ce8b0b03fb..c1fa8582ed8a8 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -10,17 +10,15 @@ echo Patching the bootstrap tools... # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So # use a copy of patchelf. -LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf . +LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 $out/bin/cp $out/bin/patchelf . -set +e for i in $out/bin/* $out/libexec/gcc/*/*/*; do echo patching $i if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ - ./patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ + ./patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i fi done -set -e # Fix the libc linker script. export PATH=$out/bin |