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

Don't append AVR_TOOLS_PATH if we're on Linux, we already have it in the path.

Browse source
This commit is contained in:
Christopher Peplin 2012-04-02 17:19:39 -04:00
parent c024014881
commit 11939a41b7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arduino-mk/Arduino.mk
View file

@ -282,6 +282,14 @@ ifndef ISP_EXT_FUSE
ISP_EXT_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.extended_fuses)
endif
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

10
arduino-mk/chipKIT.mk
View file

@ -33,10 +33,6 @@ else
AVRDUDE_ETC_PATH = $(AVRDUDE_TOOLS_PATH)
endif
ifndef BOARD
BOARD = $(shell $(PARSE_BOARD) $(BOARD_TAG) board)
endif
ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/pic32/cores/pic32
ARDUINO_LIB_PATH = $(ARDUINO_DIR)/hardware/pic32/libraries
BOARDS_TXT = $(ARDUINO_DIR)/hardware/pic32/boards.txt
@ -49,10 +45,8 @@ AR_NAME = pic32-ar
OBJDUMP_NAME = pic32-objdump
OBJCOPY_NAME = pic32-objcopy
LDSCRIPT = $(shell $(PARSE_BOARD) $(BOARD_TAG) ldscript)
LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
MCU_FLAG_NAME=mprocessor
LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
EXTRA_LDFLAGS = -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT)
EXTRA_CPPFLAGS = -mno-smart-io -D$(BOARD)
@ -60,6 +54,7 @@ CHIPKIT_MK_PATH := $(dir $(lastword $(MAKEFILE_LIST)))
include $(CHIPKIT_MK_PATH)/Arduino.mk
ifeq ($(OSTYPE),Linux)
# MPIDE still comes with the compilers on Linux, unlike Arduino
CC := $(addprefix $(AVR_TOOLS_PATH),$(CC))
CXX := $(addprefix $(AVR_TOOLS_PATH),$(CXX))
@ -68,3 +63,4 @@ OBJDUMP := $(addprefix $(AVR_TOOLS_PATH),$(OBJDUMP))
AR := $(addprefix $(AVR_TOOLS_PATH),$(AR))
SIZE := $(addprefix $(AVR_TOOLS_PATH),$(SIZE))
NM := $(addprefix $(AVR_TOOLS_PATH),$(NM))
endif