From 8bedb690a2295b7330380624c9c6241966bb9d1a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 12 Feb 2018 14:14:57 -0600 Subject: [PATCH] add musl bootstrap paths for aarch64, armv6l Aarch64 tools tested briefly with qemu-aarch64, but neither have been actually used yet :). For now only "host" indirectly via binary cache at cache.allvm.org. --- pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix | 5 +++++ pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix | 5 +++++ pkgs/stdenv/linux/default.nix | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix create mode 100644 pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix new file mode 100644 index 000000000000..91eeea1abb30 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix @@ -0,0 +1,5 @@ +{ + # https://cache.allvm.org + busybox = builtins.storePath /nix/store/88snbnw04cldx4c3k9qrd0y2vifld2b2-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox; + bootstrapTools = builtins.storePath /nix/store/88snbnw04cldx4c3k9qrd0y2vifld2b2-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; +} diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix new file mode 100644 index 000000000000..ff2cffda932c --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix @@ -0,0 +1,5 @@ +{ + # https://cache.allvm.org + busybox = builtins.storePath /nix/store/m4n9p43b7q8k1wqbpw264947rm70mj1z-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox; + bootstrapTools = builtins.storePath /nix/store/m4n9p43b7q8k1wqbpw264947rm70mj1z-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 8a8e52d1dfb6..249f788c17ae 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -18,7 +18,9 @@ "mips64el-linux" = import ./bootstrap-files/loongson2f.nix; }; "musl" = { - "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; + "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; + "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; + "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; }; }; archLookupTable = table.${localSystem.libc}