about summary refs log tree commit diff
path: root/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-05-06 11:15:13 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-05-07 06:04:10 +0300
commita7c4aba8968dfa85a147f60398d266441bc2b5ae (patch)
treea49b9b75d65997870eb3a8e6bbe7d9582112942c /pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
parent0d5e144210a3a2b2d486de88c26bff0fcb1e0b33 (diff)
downloadnixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar.gz
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar.bz2
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar.lz
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar.xz
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.tar.zst
nixlib-a7c4aba8968dfa85a147f60398d266441bc2b5ae.zip
ARM: Assume armv7l-hf-multiplatform instead of beaglebone
Several places in the tree associate the ARMv7 system
with the beaglebone platform. Change them to point to
armv7l-hf-multiplatform as it supports several boards (including the
beaglebone as well)
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools-cross.nix')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 9cc5d4700878..520bdd208e36 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -34,7 +34,7 @@ let
     };
   };
   
-  beagleboneCrossSystem = {
+  armv7l-hf-multiplatform-crossSystem = {
     crossSystem = rec {
       config = "armv7l-unknown-linux-gnueabi";  
       bigEndian = false;
@@ -43,7 +43,7 @@ let
       fpu = "vfpv3-d16";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.beaglebone;
+      platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -52,7 +52,7 @@ let
   selectedCrossSystem =
     if toolsArch == "armv5tel" then sheevaplugCrossSystem else
     if toolsArch == "armv6l" then raspberrypiCrossSystem else
-    if toolsArch == "armv7l" then beagleboneCrossSystem else null;
+    if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
 
   pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);