From 1893199dad80af98b9ba1ef1e89d06f086cab58f Mon Sep 17 00:00:00 2001 From: Simon John Date: Sat, 1 Feb 2014 00:41:00 +0000 Subject: BUNDLED_AVR_TOOLS_DIR is now set correctly using := instead of ?=, so that installations using only the arduino-core packages that don't have the $(ARDUINO_DIR)/hardware/tools/avr directory can still use the avr-g++ tools found in the $PATH (/usr/bin) Previously BUNDLED_AVR_TOOLS_DIR was set to an empty string as the directory doesn't exist, which meant that "ifdef BUNDLED_AVR_TOOLS_DIR..." was set rather than skipping to "else SYSTEMPATH_AVR_TOOLS_DIR...." No user would set BUNDLED_AVR_TOOLS_DIR so the assignment operator := should be used not ?= Updated the version info/changes in various locations. --- Arduino.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index 3a66868..625527b 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -354,7 +354,7 @@ 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) -- cgit v1.2.3