From 8606592063eab7cd25fd87eea732a47d297f49e3 Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Thu, 26 Mar 2015 23:17:05 +0000
Subject: 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)
---
 Arduino.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Arduino.mk')

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])
-- 
cgit v1.2.3