Move files

+8 -11
pkgs/stdenv/linux/bootstrap/armv5tel/default.nix pkgs/stdenv/linux/bootstrap/armv5tel.nix
+1 -1
pkgs/stdenv/linux/bootstrap/armv6l/default.nix pkgs/stdenv/linux/bootstrap/armv6l.nix
··· 1 # Use the static tools for armv5tel-linux. 2 - (import ../armv5tel) // 3 4 { 5 bootstrapTools = {
··· 1 # Use the static tools for armv5tel-linux. 2 + (import ./armv5tel.nix) // 3 4 { 5 bootstrapTools = {
-3
pkgs/stdenv/linux/bootstrap/armv7l/default.nix
··· 1 - # rely on ARM backward compatibility to build armv7l binaries with the 2 - # bootstrap tools of armv5tel. 3 - import ../armv5tel
···
pkgs/stdenv/linux/bootstrap/i686/default.nix pkgs/stdenv/linux/bootstrap/i686.nix
pkgs/stdenv/linux/bootstrap/loongson2f/default.nix pkgs/stdenv/linux/bootstrap/loongson2f.nix
+1 -1
pkgs/stdenv/linux/bootstrap/x86_64/default.nix pkgs/stdenv/linux/bootstrap/x86_64.nix
··· 1 # Use the static tools for i686-linux. They work on x86_64-linux 2 # machines as well. 3 - (import ../i686) // 4 5 { 6 bootstrapTools = {
··· 1 # Use the static tools for i686-linux. They work on x86_64-linux 2 # machines as well. 3 + (import ./i686.nix) // 4 5 { 6 bootstrapTools = {
+6 -6
pkgs/stdenv/linux/default.nix
··· 14 lib = import ../../../lib; 15 16 bootstrapFiles = 17 - if system == "i686-linux" then import ./bootstrap/i686 18 - else if system == "x86_64-linux" then import ./bootstrap/x86_64 19 - else if system == "armv5tel-linux" then import ./bootstrap/armv5tel 20 - else if system == "armv6l-linux" then import ./bootstrap/armv6l 21 - else if system == "armv7l-linux" then import ./bootstrap/armv6l 22 - else if system == "mips64el-linux" then import ./bootstrap/loongson2f 23 else abort "unsupported platform for the pure Linux stdenv"; 24 25
··· 14 lib = import ../../../lib; 15 16 bootstrapFiles = 17 + if system == "i686-linux" then import ./bootstrap/i686.nix 18 + else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix 19 + else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix 20 + else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix 21 + else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix 22 + else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix 23 else abort "unsupported platform for the pure Linux stdenv"; 24 25