From 6c173f4c79fd827b62a7936c9aa99afef8e041a8 Mon Sep 17 00:00:00 2001 From: Jake Carter Date: Tue, 27 Feb 2024 14:24:24 -0700 Subject: [PATCH] Fix include when SUPRESS_HELP is enabled --- Libraries/CMSIS/Device/Maxim/GCC/gcc.mk | 7 +++++-- Libraries/CMSIS/Device/Maxim/GCC/gcc_riscv.mk | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk b/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk index e5ed64f931a..8e857202973 100644 --- a/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk +++ b/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk @@ -19,14 +19,17 @@ # ############################################################################## +ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" "" +include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk +endif + SUPPRESS_HELP ?= 0 ifeq "$(SUPPRESS_HELP)" "0" ifneq "$(HELP_COMPLETE)" "1" $(info ****************************************************************************) $(info * Analog Devices MSDK) -ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" "" -include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk +ifneq "$(MSDK_VERSION_STRING)" "" $(info * $(MSDK_VERSION_STRING)) endif $(info * - User Guide: https://analogdevicesinc.github.io/msdk/USERGUIDE/) diff --git a/Libraries/CMSIS/Device/Maxim/GCC/gcc_riscv.mk b/Libraries/CMSIS/Device/Maxim/GCC/gcc_riscv.mk index 0ddfd40b98e..c90be7bdbb8 100644 --- a/Libraries/CMSIS/Device/Maxim/GCC/gcc_riscv.mk +++ b/Libraries/CMSIS/Device/Maxim/GCC/gcc_riscv.mk @@ -19,14 +19,17 @@ # ############################################################################## +ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" "" +include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk +endif + SUPPRESS_HELP ?= 0 ifeq "$(SUPPRESS_HELP)" "0" ifneq "$(HELP_COMPLETE)" "1" $(info ****************************************************************************) $(info * Analog Devices MSDK) -ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" "" -include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk +ifneq "$(MSDK_VERSION_STRING)" "" $(info * $(MSDK_VERSION_STRING)) endif $(info * - User Guide: https://analogdevicesinc.github.io/msdk/USERGUIDE/)