summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2024-03-25 17:46:28 +0700
committerhathach <[email protected]>2024-03-25 17:46:28 +0700
commit98b8e960aa20c7d29d4dfe9c7712a8a865b87827 (patch)
treeec7ae05c2ff135249c7332f278eb47459ed6dca9 /examples
parent94c27fcdf77cdc4599df232b7785dfc5d3cc7407 (diff)
parentc028cfa7cf2fa281e6c88a816cf70fd80eb68338 (diff)
Merge branch 'master' into add-tuh-deinit
Diffstat (limited to 'examples')
-rw-r--r--examples/build_system/make/toolchain/arm_gcc.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/build_system/make/toolchain/arm_gcc.mk b/examples/build_system/make/toolchain/arm_gcc.mk
index b87657f53..ed5ddc970 100644
--- a/examples/build_system/make/toolchain/arm_gcc.mk
+++ b/examples/build_system/make/toolchain/arm_gcc.mk
@@ -74,6 +74,8 @@ LDFLAGS += -Wl,--print-memory-usage
endif
# from version 12
-ifeq ($(shell expr $(CC_VERSION_MAJOR) \>= 12),1)
+ifeq ($(strip $(if $(CMDEXE),\
+ $(shell if $(CC_VERSION_MAJOR) geq 12 (echo 1) else (echo 0)),\
+ $(shell expr $(CC_VERSION_MAJOR) \>= 12))), 1)
LDFLAGS += -Wl,--no-warn-rwx-segment
endif