diff options
| author | hathach <[email protected]> | 2024-04-02 18:14:49 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2024-04-02 18:14:49 +0700 |
| commit | 18a458679f9581f53108005f0cd028acc79236e2 (patch) | |
| tree | 21d7ccb76588b97dd463137839d914baf3fe694c /examples/build_system | |
| parent | 2a21b6980b8efc87adb44f20a60a5f2ffda79518 (diff) | |
| parent | 574916f53088adebb6d0f2cede4a96e99ef9e605 (diff) | |
Merge branch 'master' into MCX
Diffstat (limited to 'examples/build_system')
| -rw-r--r-- | examples/build_system/cmake/toolchain/arm_gcc.cmake | 12 | ||||
| -rw-r--r-- | examples/build_system/make/toolchain/arm_gcc.mk | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/examples/build_system/cmake/toolchain/arm_gcc.cmake b/examples/build_system/cmake/toolchain/arm_gcc.cmake index 7680d75ab..d3fd5b557 100644 --- a/examples/build_system/cmake/toolchain/arm_gcc.cmake +++ b/examples/build_system/cmake/toolchain/arm_gcc.cmake @@ -1,8 +1,14 @@ set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_C_COMPILER "arm-none-eabi-gcc") -set(CMAKE_CXX_COMPILER "arm-none-eabi-g++") -set(CMAKE_ASM_COMPILER "arm-none-eabi-gcc") +if (NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "arm-none-eabi-gcc") +endif () + +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "arm-none-eabi-g++") +endif () + +set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) set(CMAKE_SIZE "arm-none-eabi-size" CACHE FILEPATH "") set(CMAKE_OBJCOPY "arm-none-eabi-objcopy" CACHE FILEPATH "") 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 |