summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorHiFiPhile <[email protected]>2024-03-24 11:40:29 +0100
committerGitHub <[email protected]>2024-03-24 11:40:29 +0100
commit81e4f65ddd6e8294bd79f0941fa3779d48099994 (patch)
treeef2b381a2decbd3d5edc972bc0733531907af3aa /examples
parent67cd8349d614f7a981117ad85d6707e106cd6145 (diff)
parentaba00ed22c6fe9ce5ca636c2909a55ab48c65d14 (diff)
Merge pull request #2533 from kkitayam/fix_error_on_cmd
Fix the error that occurs when executing make on Windows
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