From ec3c27df0d4c2dac651b56e2d3fba16fe2d04747 Mon Sep 17 00:00:00 2001 From: wangmingrong1 Date: Thu, 10 Oct 2024 11:58:56 +0800 Subject: [PATCH] makefile/clang: Compare versions for upward compatibility Signed-off-by: wangmingrong1 --- arch/arm/src/cmake/clang.cmake | 2 +- arch/arm/src/common/Toolchain.defs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/cmake/clang.cmake b/arch/arm/src/cmake/clang.cmake index 66c3795fd56..55ef881b680 100644 --- a/arch/arm/src/cmake/clang.cmake +++ b/arch/arm/src/cmake/clang.cmake @@ -50,7 +50,7 @@ if(TOOLCHAIN_CLANG_CONFIG) if(CLANGVER STREQUAL "14.0") set(TOOLCHAIN_CLANG_CONFIG ${TOOLCHAIN_CLANG_CONFIG}_nosys) - elseif(CLANGVER STREQUAL "17.0") + elseif(CLANGVER STRGREATER_EQUAL "17.0") set(TOOLCHAIN_CLANG_OPTION -target) add_compile_options(--target=arm-none-eabi) else() diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs index 284b1331ee6..dc1a2b2ccc1 100644 --- a/arch/arm/src/common/Toolchain.defs +++ b/arch/arm/src/common/Toolchain.defs @@ -213,7 +213,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) TOOLCHAIN_CLANG_CONFIG := $(TOOLCHAIN_CLANG_CONFIG)_nosys endif - ifeq ($(CLANGVER),17.0) + ifeq "17.0" "$(word 1, $(sort 17.0 $(CLANGVER)))" TOOLCHAIN_CLANG_OPTION = -target ARCHCPUFLAGS += --target=arm-none-eabi else