diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 01:27:15 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 01:27:15 +0200 |
commit | b614ea22d459a34ed6163ab5d94ae6cd28ee2016 (patch) | |
tree | ec0e89bbc19651f27c43c4d4fa45de1bf3746102 /pkgs/stdenv | |
parent | d4f44d6db351bdfcd089a26fc9cc973254a48cae (diff) |
Move files
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/armv5tel.nix (renamed from pkgs/stdenv/linux/bootstrap/armv5tel/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/armv6l.nix (renamed from pkgs/stdenv/linux/bootstrap/armv6l/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/armv7l/default.nix | 3 | ||||
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/i686.nix (renamed from pkgs/stdenv/linux/bootstrap/i686/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/loongson2f.nix (renamed from pkgs/stdenv/linux/bootstrap/loongson2f/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/stdenv/linux/bootstrap/x86_64.nix (renamed from pkgs/stdenv/linux/bootstrap/x86_64/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 12 |
7 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel.nix index 6d18b3bd8cb15..6d18b3bd8cb15 100644 --- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix +++ b/pkgs/stdenv/linux/bootstrap/armv5tel.nix diff --git a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix b/pkgs/stdenv/linux/bootstrap/armv6l.nix index 542f74de49fe7..85b868359052b 100644 --- a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix +++ b/pkgs/stdenv/linux/bootstrap/armv6l.nix @@ -1,5 +1,5 @@ # Use the static tools for armv5tel-linux. -(import ../armv5tel) // +(import ./armv5tel.nix) // { bootstrapTools = { diff --git a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix deleted file mode 100644 index 0fc2002068efc..0000000000000 --- a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -# rely on ARM backward compatibility to build armv7l binaries with the -# bootstrap tools of armv5tel. -import ../armv5tel \ No newline at end of file diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686.nix index 7b6b3ee803443..7b6b3ee803443 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686.nix diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f.nix index 8e22a274974a1..8e22a274974a1 100644 --- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix +++ b/pkgs/stdenv/linux/bootstrap/loongson2f.nix diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64.nix index eb8c1834a3af8..71961e6961e60 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64.nix @@ -1,6 +1,6 @@ # Use the static tools for i686-linux. They work on x86_64-linux # machines as well. -(import ../i686) // +(import ./i686.nix) // { bootstrapTools = { diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 02635bf1fd5d3..1c6a93b222d2e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -14,12 +14,12 @@ rec { lib = import ../../../lib; bootstrapFiles = - if system == "i686-linux" then import ./bootstrap/i686 - else if system == "x86_64-linux" then import ./bootstrap/x86_64 - else if system == "armv5tel-linux" then import ./bootstrap/armv5tel - else if system == "armv6l-linux" then import ./bootstrap/armv6l - else if system == "armv7l-linux" then import ./bootstrap/armv6l - else if system == "mips64el-linux" then import ./bootstrap/loongson2f + if system == "i686-linux" then import ./bootstrap/i686.nix + else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix + else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix + else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix + else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix + else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix else abort "unsupported platform for the pure Linux stdenv"; |