diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-10 08:06:13 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-10 08:06:13 +0000 |
| commit | 53be52922fa690b57fcfdd2ea531f876516b3b67 (patch) | |
| tree | 613bd3df574e5a20062483496512540e42c1ddfd /LUFA/Build/lufa.build.in | |
| parent | 3808f5c36d0ee183e9825e645cc984f1c6047ef5 (diff) | |
| download | lufa-53be52922fa690b57fcfdd2ea531f876516b3b67.tar.gz lufa-53be52922fa690b57fcfdd2ea531f876516b3b67.tar.bz2 lufa-53be52922fa690b57fcfdd2ea531f876516b3b67.zip | |
Change the build system build module makefiles to have a set of sanity check macros they can call to verify user data. Add additional sanity checks.
Diffstat (limited to 'LUFA/Build/lufa.build.in')
| -rw-r--r-- | LUFA/Build/lufa.build.in | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index 59b81d939..b1f9efe9c 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -55,26 +55,9 @@ LUFA_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_ # # ----------------------------------------------------------------------------- -# Sanity-check values of mandatory user-supplied variables -MCU ?= $(error Makefile MCU value not set) -TARGET ?= $(error Makefile TARGET value not set) -ARCH ?= $(error Makefile ARCH value not set) -SRC ?= $(error Makefile SRC value not set) -F_USB ?= $(error Makefile F_USB value not set) -LUFA_PATH ?= $(error Makefile LUFA_PATH value not set) - -ifeq ($(MCU),) - $(error Makefile MCU option cannot be blank) -endif -ifeq ($(TARGET),) - $(error Makefile TARGET option cannot be blank) -endif -ifeq ($(ARCH),) - $(error Makefile ARCH option cannot be blank) -endif -ifeq ($(F_USB),) - $(error Makefile F_USB option cannot be blank) -endif +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)) # Default values of optionally user-supplied variables BOARD ?= NONE @@ -87,6 +70,18 @@ CPP_FLAGS ?= ASM_FLAGS ?= CC_FLAGS ?= +# Sanity check user supplied values +$(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) +$(call ERROR_IF_EMPTY, MCU) +$(call ERROR_IF_EMPTY, TARGET) +$(call ERROR_IF_EMPTY, ARCH) +$(call ERROR_IF_EMPTY, F_USB) +$(call ERROR_IF_EMPTY, LUFA_PATH) +$(call ERROR_IF_EMPTY, BOARD) +$(call ERROR_IF_EMPTY, OPTIMIZATION) +$(call ERROR_IF_EMPTY, C_STANDARD) +$(call ERROR_IF_EMPTY, CPP_STANDARD) + # Determine the utility prefix to use for the selected architecture ifeq ($(ARCH), AVR8) CROSS := avr- |