From 83cbf3578752b545ed11d1e72d94e9b15c3e71e6 Mon Sep 17 00:00:00 2001
From: Christopher Peplin <cpeplin@ford.com>
Date: Tue, 3 Apr 2012 12:01:58 -0400
Subject: [PATCH] Move LDSCRIPT back into chipKIT - it gets resolved
 eventually.

---
 arduino-mk/Arduino.mk | 4 ----
 arduino-mk/chipKIT.mk | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 03ad3b1..f218b63 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -292,10 +292,6 @@ ifndef BOARD
 BOARD = $(shell $(PARSE_BOARD), $(BOARD_TAG), board)
 endif
 
-ifndef LDSCRIPT
-LDSCRIPT = $(shell $(PARSE_BOARD), $(BOARD_TAG), ldscript)
-endif
-
 # Everything gets built in here
 OBJDIR  	  = build-cli
 
diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk
index 1b13311..d3c378c 100644
--- a/arduino-mk/chipKIT.mk
+++ b/arduino-mk/chipKIT.mk
@@ -46,6 +46,7 @@ OBJDUMP_NAME = pic32-objdump
 OBJCOPY_NAME = pic32-objcopy
 
 MCU_FLAG_NAME=mprocessor
+LDSCRIPT = $(call PARSE_BOARD,$(BOARD_TAG),ldscript)
 LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
 EXTRA_LDFLAGS  = -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT)
 EXTRA_CPPFLAGS = -mno-smart-io -D$(BOARD)