From 605287c045a0fd184a1278d9f06a0e5a4eaaf2c6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 19 Aug 2021 18:28:20 +0200 Subject: [PATCH] package/rustc: fix conditions related to MIPS support For MIPS64 architecture variants supported by Rust, we need to exclude MIPS64R6, but due to a copy/paste mistake in commit d69d40c029dc7d8199b745eaee759d92b66c5d17 ("package/rustc: add support for Tier 1 and Tier 2 platform"), we used BR2_MIPS_CPU_MIPS32R6 for both MIPS 32-bit and MIPS 64-bit configurations, while BR2_MIPS_CPU_MIPS64R6 should be used on MIPS 64-bit. Fixes: http://autobuild.buildroot.net/8bab232eb98b164df300581ae019254bde7c8ca3/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/rustc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index c5f64fd3c6..90ea56f626 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -36,11 +36,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS # mips-unknown-linux-gnu default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-gnuabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mipsel-unknown-linux-gnu default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 # mips64el-unknown-linux-gnuabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # powerpc-unknown-linux-gnu default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC # powerpc64-unknown-linux-gnu @@ -84,9 +84,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mipsel-unknown-linux-musl default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu -- 2.30.2