* Dietlibc tar doesn't work on x86_64, use one statically linked with

glibc.
* Doh!  $tar/bin/tar should have been $gnutar/bin/tar, so we copied
  /bin/tar!

svn path=/nixpkgs/trunk/; revision=6821

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -26,13 +26,19 @@ let
     
     inherit (pkgsDiet)
       coreutils findutils diffutils gnugrep
-      gnutar gzip bzip2 gnumake bash patch;
+      gzip bzip2 gnumake bash patch;
       
     gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
 
     # patchelf is C++, won't work with dietlibc.
     inherit (pkgsStatic) patchelf;
 
+    gnutar =
+      # Tar seems to be broken on dietlibc on x86_64.
+      if pkgs.stdenv.system == "i686-linux"
+      then pkgsDiet.gnutar
+      else pkgsStatic.gnutar;
+
     gawk = 
       # Dietlibc only provides sufficient math functions (fmod, sin,
       # cos, etc.) on i686.  On other platforms, use Glibc.