From 171c7f0e63b0f92c71c73b756cbbd91b8ddce444 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 17 Jul 2016 00:11:34 +0300
Subject: make-bootstrap-tools-cross.nix: Have more consistency with
 platforms.nix

E.g. we had `arch = "arm"` in the former and `arch = "armv6"` in the
latter. Try to have some more consistency.
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/stdenv/linux')

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 8dce40b08a7..32f287cdc4c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -8,9 +8,9 @@ let
 
   sheevaplugCrossSystem = {
     crossSystem = rec {
-      config = "armv5tel-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabi";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv5te";
       float = "soft";
       withTLS = true;
       libc = "glibc";
@@ -21,9 +21,9 @@ let
 
   raspberrypiCrossSystem = {
     crossSystem = rec {
-      config = "armv6l-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabihf";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv6";
       float = "hard";
       fpu = "vfp";
       withTLS = true;
@@ -36,9 +36,9 @@ let
 
   armv7l-hf-multiplatform-crossSystem = {
     crossSystem = rec {
-      config = "armv7l-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabihf";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv7-a";
       float = "hard";
       fpu = "vfpv3-d16";
       withTLS = true;
-- 
cgit 1.4.1