diff options
| author | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-01-22 11:50:24 -0500 |
|---|---|---|
| committer | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-01-28 09:43:33 -0500 |
| commit | 067afbb8e4f6800909c01bf5f75fd90929c6c313 (patch) | |
| tree | 19c76058cc80510f1c30bff5ebcc95a25b2f7507 /Arduino.mk | |
| parent | ac0b7d46c32eb03801e97c1c7e4d586fe93b3bfa (diff) | |
Override complete compiler tool paths for chipKIT.
Previously we were setting the AVR tools path to the PIC32 tools path because it
made grabbing the compiling tools easier. Consequently, it made finding the
avrdude path much harder, especially since the avrdude files are in different
locations in the Linux distributions of MPIDE and Arduino.
Instead, we set the AVR tools path to the *correct* path (where *AVR* dude
lives), and totally override the CC, CXX, etc. paths to point to their PIC32
equivalents.
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -354,7 +354,8 @@ endif ifndef AVR_TOOLS_DIR - BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) + BUNDLED_AVR_TOOLS_DIR ?= $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) + ifdef BUNDLED_AVR_TOOLS_DIR AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) @@ -708,15 +709,20 @@ TARGET_EEP = $(OBJDIR)/$(TARGET).eep TARGETS = $(OBJDIR)/$(TARGET).* CORE_LIB = $(OBJDIR)/libcore.a -# Names of executables -CC = $(AVR_TOOLS_PATH)/$(CC_NAME) -CXX = $(AVR_TOOLS_PATH)/$(CXX_NAME) -AS = $(AVR_TOOLS_PATH)/$(AS_NAME) -OBJCOPY = $(AVR_TOOLS_PATH)/$(OBJCOPY_NAME) -OBJDUMP = $(AVR_TOOLS_PATH)/$(OBJDUMP_NAME) -AR = $(AVR_TOOLS_PATH)/$(AR_NAME) -SIZE = $(AVR_TOOLS_PATH)/$(SIZE_NAME) -NM = $(AVR_TOOLS_PATH)/$(NM_NAME) +# Names of executables - chipKIT needs to override all to set paths to PIC32 +# tools, and we can't use "?=" assignment because these are already implicitly +# defined by Make (e.g. $(CC) == cc). +ifndef OVERRIDE_EXECUTABLES + CC = $(AVR_TOOLS_PATH)/$(CC_NAME) + CXX = $(AVR_TOOLS_PATH)/$(CXX_NAME) + AS = $(AVR_TOOLS_PATH)/$(AS_NAME) + OBJCOPY = $(AVR_TOOLS_PATH)/$(OBJCOPY_NAME) + OBJDUMP = $(AVR_TOOLS_PATH)/$(OBJDUMP_NAME) + AR = $(AVR_TOOLS_PATH)/$(AR_NAME) + SIZE = $(AVR_TOOLS_PATH)/$(SIZE_NAME) + NM = $(AVR_TOOLS_PATH)/$(NM_NAME) +endif + REMOVE = rm -rf MV = mv -f CAT = cat |