From f42a7e6508ffb1b5462847015be992a714533568 Mon Sep 17 00:00:00 2001 From: Simon John Date: Sat, 28 Mar 2015 16:10:06 +0000 Subject: Added support for VARIANT in submenu's Also added a note that in certain 1.6 cores (attiny) F_CPU is a submenu item e.g. attiny.menu.clock.internal1.build.f_cpu=1000000L --- Arduino.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index 3b4d246..768aaf6 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -577,7 +577,14 @@ ifeq ($(strip $(NO_CORE)),) # Which variant ? This affects the include path ifndef VARIANT - VARIANT = $(call PARSE_BOARD,$(BOARD_TAG),build.variant) + VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),build.variant) + ifndef VARIANT + # might be a submenu + VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.cpu.$(BOARD_SUB).build.variant) + endif + $(call show_config_variable,VARIANT,[COMPUTED],(from build.variant)) + else + $(call show_config_variable,VARIANT,[USER]) endif # see if we are a caterina device like leonardo or micro -- cgit v1.2.3