summary refs log tree commit diff
path: root/pkgs/stdenv/linux
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-07-17 00:11:34 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2016-07-20 02:38:10 +0300
commit171c7f0e63b0f92c71c73b756cbbd91b8ddce444 (patch)
treeacd4f19d9a99161202afb8caec1bc67ef1f385e4 /pkgs/stdenv/linux
parent9f0dc294da55783c4636b68a78f755754606f2c7 (diff)
downloadnixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar.gz
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar.bz2
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar.lz
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar.xz
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.tar.zst
nixpkgs-171c7f0e63b0f92c71c73b756cbbd91b8ddce444.zip
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.
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix12
1 files changed, 6 insertions, 6 deletions
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;