Added BOARD_SUB to OBJDIR so that when changing sub boards we don't accidentally overwrite

existing builds.

E.g. mega1280 and mega2560 previously *both* created a "build-mega" directory,
now they'll create build-mega-mega2560 and build-mega-mega1280

Only applies to 1.5+ of course, and only when BOARD_SUB is used. 1.0 will still
create build-mega2560 and build-mega1280 directories (just BOARD_TAG)

1 files changed, 3 insertions, 0 deletions

diff --git a/Arduino.mk b/Arduino.mk
index d4fe5cc..cc156fc 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -688,6 +688,9 @@ endif
 # Everything gets built in here (include BOARD_TAG now)
 ifndef OBJDIR
     OBJDIR = build-$(BOARD_TAG)
+    ifdef BOARD_SUB
+        OBJDIR = build-$(BOARD_TAG)-$(BOARD_SUB)
+    endif
     $(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
 else
     $(call show_config_variable,OBJDIR,[USER])