diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-03-28 16:34:58 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-03-28 16:34:58 +0000 |
| commit | cfe83bca2033cdefd9208c8db9bce1c225843ef7 (patch) | |
| tree | b54077a289f8c5db6955dfb9e9267702ac419455 /Arduino.mk | |
| parent | 861d2ff72f9597c5ca0e486437a7c73f3262cc69 (diff) | |
| parent | 47395782c39f6845736dcc78f2da8f1b902b75a7 (diff) | |
Merge pull request #336 from sej7278/master
Added support for VARIANT in submenu's
Also fixed sed issue on OSX (copyright symbol)
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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 |