diff options
Diffstat (limited to 'package/rustc')
| -rw-r--r-- | package/rustc/Config.in.host | 6 | ||||
| -rw-r--r-- | package/rustc/rustc.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index d93ff05209..1c79eededc 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -1,17 +1,18 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # The pre-built Rust standard library is only available for the # following architectures/ABIs, and is built against glibc. default y if BR2_i386 default y if BR2_x86_64 default y if BR2_aarch64 - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ + && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) default y if BR2_powerpc || BR2_powerpc64 default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ && BR2_MIPS_NABI64 depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" config BR2_PACKAGE_HOST_RUSTC_ARCH string @@ -76,4 +77,3 @@ config BR2_PACKAGE_PROVIDES_HOST_RUSTC default "host-rust-bin" if BR2_PACKAGE_HOST_RUST_BIN endif - diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 7a951c0cfd..bed74f3c2c 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -7,7 +7,7 @@ RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH)) RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI)) -RUST_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) +RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) ifeq ($(HOSTARCH),x86) RUSTC_HOST_ARCH = i686 @@ -15,6 +15,6 @@ else RUSTC_HOST_ARCH = $(HOSTARCH) endif -RUST_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu +RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) |
