diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-09-19 16:20:30 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-09-19 16:22:28 +0530 |
| commit | 63006793439b30f29a96cae41341276413aaf246 (patch) | |
| tree | ef1ef2bbcb6f0322aff0673b3071e0dff41cfa5c /arduino-mk/Arduino.mk | |
| parent | 9004efd944adced49d6e44f191011fc3de82d9e2 (diff) | |
Revert "Make all executables overridable"
If these executables are not overridden in the child makefile, then the
default values are not set properly in the master makefile.
This complicates the solution for #119 :(
This reverts commit 66eec82a3af8ee5aa16e28230346e4a1f166da2b.
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index f6c1ecf..ed95207 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -714,19 +714,19 @@ 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) -REMOVE ?= rm -rf -MV ?= mv -f -CAT ?= cat -ECHO ?= echo -MKDIR ?= mkdir -p +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) +REMOVE = rm -rf +MV = mv -f +CAT = cat +ECHO = echo +MKDIR = mkdir -p # General arguments USER_LIBS = $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))) |