From 607a5a3b79527d75128949d15a39b16166f7c7e4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 26 Oct 2021 16:17:21 +0900 Subject: [PATCH] package/Makefile.in: Fix NOMMU RISC-V 64-bits toolchain base name Using *-uclinux-* seems like an only partially followed convention. And at least RISC-V 64-bits gcc does not know about uclinux tuples. So switch back to the normal "linux" one for now. Signed-off-by: Christoph Hellwig [Damien] * Make the change conditional on BR2_RISCV_64 being "y". Signed-off-by: Damien Le Moal Acked-by: Alistair Francis Signed-off-by: Peter Korsgaard --- package/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 04347d2d84..dae7a859fd 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -39,8 +39,9 @@ endif # Compute GNU_TARGET_NAME GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI) -# FLAT binary format needs uclinux -ifeq ($(BR2_BINFMT_FLAT),y) +# FLAT binary format needs uclinux, except RISC-V 64-bits which needs +# the regular linux name. +ifeq ($(BR2_BINFMT_FLAT):$(BR2_RISCV_64),y:) TARGET_OS = uclinux else TARGET_OS = linux