diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-05 21:10:07 +1000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-05 21:10:07 +1000 |
commit | 3126cbbf96a24afd447ece00248e5ece39dd088a (patch) | |
tree | 1acda324a1334c208f775b1c9e22e934ef7c64f5 /LUFA/Build/DMBS/DMBS/gcc.mk | |
parent | 75b68126d01306347626215ec8ad1537c903e4cd (diff) | |
download | lufa-3126cbbf96a24afd447ece00248e5ece39dd088a.tar.gz lufa-3126cbbf96a24afd447ece00248e5ece39dd088a.tar.bz2 lufa-3126cbbf96a24afd447ece00248e5ece39dd088a.zip |
Update to DMBS release-20160403 release.
Diffstat (limited to 'LUFA/Build/DMBS/DMBS/gcc.mk')
-rw-r--r-- | LUFA/Build/DMBS/DMBS/gcc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/LUFA/Build/DMBS/DMBS/gcc.mk b/LUFA/Build/DMBS/DMBS/gcc.mk index c7299edff..e33c9c084 100644 --- a/LUFA/Build/DMBS/DMBS/gcc.mk +++ b/LUFA/Build/DMBS/DMBS/gcc.mk @@ -13,11 +13,11 @@ DMBS_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C DMBS_BUILD_PROVIDED_VARS += DMBS_BUILD_PROVIDED_MACROS += -SHELL = /bin/sh - -ERROR_IF_UNSET ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set)) -ERROR_IF_EMPTY ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank)) -ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N)) +# Conditionally import the CORE module of DMBS if it is not already imported +DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) +ifeq ($(findstring CORE, $(DMBS_BUILD_MODULES)),) + include $(DMBS_MODULE_PATH)/core.mk +endif # Default values of optionally user-supplied variables COMPILER_PATH ?= |