summary refs log tree commit diff
path: root/lib/systems
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-10 00:57:52 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-10 01:37:31 -0400
commita02be2bd85b37ed8b257e969d9439357844baa24 (patch)
tree5dd1c59168e51b84ced74122fe9d7e14f3e7a2d3 /lib/systems
parenta31984ecdaf7b011163c3c71679eb285d951d735 (diff)
treewide: Get rid of `*Platform.arch`
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
Diffstat (limited to 'lib/systems')
-rw-r--r--lib/systems/examples.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index f3abfe2c621f2..80e320406bf4f 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,22 +11,19 @@ rec {
 
   sheevaplug = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    arch = "armv5tel";
     float = "soft";
     platform = platforms.sheevaplug;
   };
 
   raspberryPi = rec {
     config = "armv6l-unknown-linux-gnueabihf";
-    arch = "armv6l";
     float = "hard";
     fpu = "vfp";
     platform = platforms.raspberrypi;
   };
 
   armv7l-hf-multiplatform = rec {
-    config = "arm-unknown-linux-gnueabihf";
-    arch = "armv7-a";
+    config = "armv7a-unknown-linux-gnueabihf";
     float = "hard";
     fpu = "vfpv3-d16";
     platform = platforms.armv7l-hf-multiplatform;
@@ -34,13 +31,11 @@ rec {
 
   aarch64-multiplatform = rec {
     config = "aarch64-unknown-linux-gnu";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
@@ -51,7 +46,6 @@ rec {
   };
 
   pogoplug4 = rec {
-    arch = "armv5tel";
     config = "armv5tel-unknown-linux-gnueabi";
     float = "soft";
     platform = platforms.pogoplug4;
@@ -59,7 +53,6 @@ rec {
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    arch = "mips";
     float = "soft";
     platform = {
       name = "ben_nanonote";
@@ -73,7 +66,6 @@ rec {
 
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
-    arch = "mips";
     float = "hard";
     platform = platforms.fuloong2f_n32;
   };
@@ -122,7 +114,6 @@ rec {
   # 32 bit mingw-w64
   mingw32 = {
     config = "i686-pc-mingw32";
-    arch = "x86"; # Irrelevant
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
@@ -131,7 +122,6 @@ rec {
   mingwW64 = {
     # That's the triplet they use in the mingw-w64 docs.
     config = "x86_64-pc-mingw32";
-    arch = "x86_64"; # Irrelevant
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };