dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move LDSCRIPT back into chipKIT - it gets resolved eventually.

Browse source
This commit is contained in:
Christopher Peplin 2012-04-03 12:01:58 -04:00
parent f100ba2501
commit 83cbf35787
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arduino-mk/Arduino.mk
View file

@ -292,10 +292,6 @@ ifndef BOARD
BOARD = $(shell $(PARSE_BOARD), $(BOARD_TAG), board) BOARD = $(shell $(PARSE_BOARD), $(BOARD_TAG), board)
endif endif
ifndef LDSCRIPT
LDSCRIPT = $(shell $(PARSE_BOARD), $(BOARD_TAG), ldscript)
endif
# Everything gets built in here # Everything gets built in here
OBJDIR = build-cli OBJDIR = build-cli

1
arduino-mk/chipKIT.mk
View file

@ -46,6 +46,7 @@ OBJDUMP_NAME = pic32-objdump
OBJCOPY_NAME = pic32-objcopy OBJCOPY_NAME = pic32-objcopy
MCU_FLAG_NAME=mprocessor MCU_FLAG_NAME=mprocessor
LDSCRIPT = $(call PARSE_BOARD,$(BOARD_TAG),ldscript)
LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT) LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
EXTRA_LDFLAGS = -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT) EXTRA_LDFLAGS = -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT)
EXTRA_CPPFLAGS = -mno-smart-io -D$(BOARD) EXTRA_CPPFLAGS = -mno-smart-io -D$(BOARD)