diff options
| author | Simon John <git@the-jedi.co.uk> | 2014-02-01 00:41:00 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2014-02-01 00:41:00 +0000 |
| commit | 1893199dad80af98b9ba1ef1e89d06f086cab58f (patch) | |
| tree | ca21ee8a62cedf327a1c5d25340ce1f57ea3337e /Arduino.mk | |
| parent | 20b977464526bd140605d3cbdd9e781c267406f6 (diff) | |
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.
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |