diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 20:57:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 20:57:13 +0000 |
| commit | 937578d5ef19a8e7e1a4d39ec91003c44d321a6d (patch) | |
| tree | 62eee1616ce81037bc70a5357bd126472ed10b09 /pkgs/stdenv | |
| parent | ba58eb8e22fe8108900a7b7426994928a3ea3700 (diff) | |
| download | nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar.gz nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar.bz2 nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar.lz nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar.xz nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.tar.zst nixlib-937578d5ef19a8e7e1a4d39ec91003c44d321a6d.zip | |
Some first changes to get some evaluation working on the fuloong2f
svn path=/nixpkgs/branches/stdenv-updates/; revision=22840
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f1355c2a208b..6cd2f1c7f32d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -94,7 +94,8 @@ let isLinux = result.system == "i686-linux" || result.system == "x86_64-linux" || result.system == "powerpc-linux" - || result.system == "armv5tel-linux"; + || result.system == "armv5tel-linux" + || result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux"; isSunOS = result.system == "i386-sunos"; isi686 = result.system == "i686-linux" || result.system == "i686-darwin" diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 3f68738c3108..9a337de9b218 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -80,7 +80,7 @@ rec { cp ${bzip2}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin - cp ${patchelf05}/bin/* $out/bin + cp ${patchelf}/bin/* $out/bin cp ${replace}/bin/* $out/bin cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep |