* Some fixes for rebuilding the bootstrap binaries on x86_64.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9836

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

@@ -1,6 +1,8 @@
+{system ? builtins.currentSystem}:
+
 let
 
-  pkgs = import ../../top-level/all-packages.nix {};
+  pkgs = import ../../top-level/all-packages.nix {inherit system;};
 
   
   # Have to do removeAttrs to prevent all-packages from copying
@@ -37,14 +39,14 @@ let
 
     gnutar =
       # Tar seems to be broken on dietlibc on x86_64.
-      if pkgs.stdenv.system != "x86_64-linux"
+      if system != "x86_64-linux"
       then pkgsDiet.gnutar151 # 1.16 is broken
       else pkgsStatic.gnutar;
 
     gawk = 
       # Dietlibc only provides sufficient math functions (fmod, sin,
       # cos, etc.) on i686.  On other platforms, use Glibc.
-      if pkgs.stdenv.system == "i686-linux"
+      if system == "i686-linux"
       then pkgsDiet.gawk
       else pkgsStatic.gawk;