diff options
| author | Pieter du Preez <pdupreez@gmail.com> | 2018-10-02 22:53:12 +0200 |
|---|---|---|
| committer | Pieter du Preez <pdupreez@gmail.com> | 2018-10-02 22:53:12 +0200 |
| commit | d4d3d3d6c354db1e2989d8dd671f8af96cc036d8 (patch) | |
| tree | e2039458133c714d061dc477beb09f9b683b81a8 /chipKIT.mk | |
| parent | ddf7210407b8716973b9890cf7b59561af641b96 (diff) | |
| parent | fe84c591944f74c902466d813fae0d164761dc59 (diff) | |
Merge remote-tracking branch 'org/master' into move_core_link_last
Diffstat (limited to 'chipKIT.mk')
| -rw-r--r-- | chipKIT.mk | 21 |
1 files changed, 2 insertions, 19 deletions
@@ -72,8 +72,7 @@ ifeq ($(CURRENT_OS),LINUX) AVRDUDE_CONF = $(AVRDUDE_DIR)/avrdude.conf endif -PIC32_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools -PIC32_TOOLS_PATH = $(PIC32_TOOLS_DIR)/bin +AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/pic32/compiler/pic32-tools ALTERNATE_CORE = pic32 ALTERNATE_CORE_PATH = $(MPIDE_DIR)/hardware/pic32 @@ -89,23 +88,7 @@ CORE_AS_SRCS = $(ARDUINO_CORE_PATH)/vector_table.S \ ARDUINO_VERSION = 23 -CC_NAME = pic32-gcc -CXX_NAME = pic32-g++ -AR_NAME = pic32-ar -OBJDUMP_NAME = pic32-objdump -OBJCOPY_NAME = pic32-objcopy -SIZE_NAME = pic32-size -NM_NAME = pic32-nm - -OVERRIDE_EXECUTABLES = 1 -CC = $(PIC32_TOOLS_PATH)/$(CC_NAME) -CXX = $(PIC32_TOOLS_PATH)/$(CXX_NAME) -AS = $(PIC32_TOOLS_PATH)/$(AS_NAME) -OBJCOPY = $(PIC32_TOOLS_PATH)/$(OBJCOPY_NAME) -OBJDUMP = $(PIC32_TOOLS_PATH)/$(OBJDUMP_NAME) -AR = $(PIC32_TOOLS_PATH)/$(AR_NAME) -SIZE = $(PIC32_TOOLS_PATH)/$(SIZE_NAME) -NM = $(PIC32_TOOLS_PATH)/$(NM_NAME) +TOOL_PREFIX = pic32 LDSCRIPT = $(call PARSE_BOARD,$(BOARD_TAG),ldscript) LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT) |