From 87ebad10d6d90a6a72408d4bebb7912ce2b16485 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 15 Jun 2023 16:40:19 -0400 Subject: [PATCH] rustc: add armv6l-linux to platforms armv6l-linux was incorrectly added to the list of platforms without host tools in #227987. arm-unknown-linux-gnueabihf is present in the list of Tier 2 targets with host tools, and this target corresponds to our armv6l-linux platform. --- pkgs/build-support/rust/build-rust-package/default.nix | 3 +-- pkgs/development/compilers/rust/rustc.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index aa620132c1af..9b2e62fc240a 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -162,8 +162,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "armv7a-darwin" - "armv5tel-linux" "armv6l-linux" "armv7a-linux" "m68k-linux" - "riscv32-linux" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "riscv32-linux" "armv6l-netbsd" "x86_64-redox" "wasm32-wasi" diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 5d1430344d0d..05b8249d82e8 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -238,7 +238,7 @@ in stdenv.mkDerivation rec { "x86_64-darwin" "i686-darwin" "aarch64-darwin" "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" - "aarch64-linux" "armv7l-linux" "i686-linux" "mipsel-linux" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd"