From 63006793439b30f29a96cae41341276413aaf246 Mon Sep 17 00:00:00 2001
From: Sudar <sudar@sudarmuthu.com>
Date: Thu, 19 Sep 2013 16:20:30 +0530
Subject: 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.
---
 arduino-mk/Arduino.mk | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'arduino-mk/Arduino.mk')

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)))
-- 
cgit v1.2.3