diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:37 +0200 |
commit | 5227fb1dd53fcb5918b9342dff4868f4ad68427e (patch) | |
tree | d6cd521e3f67944031216a27f740f28f22b73b41 /pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | |
parent | d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 (diff) | |
parent | 33373d939a19f465228ddede6d38ce9032b5916b (diff) | |
download | nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.gz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.bz2 nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.lz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.xz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.zst nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.zip |
Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools-cross.nix')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 |
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 cdec5cc7f4a3..ed2154d00d2e 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); |