diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-09-14 23:50:41 +0100 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-09-14 23:50:41 +0100 |
| commit | 3198aeab40194778f8c2cc869af82c7b1de688e0 (patch) | |
| tree | 7d3a77951469f3d676ef9c9875ec564b41c55490 | |
| parent | 7efd0ccd2c420a369f4934553c3e98c1de187e02 (diff) | |
| parent | 44fe2270a2d1a2685c3682506ae92eeaa61ea4c5 (diff) | |
Merge pull request #385 from sej7278/master
Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is manually set
| -rw-r--r-- | Arduino.mk | 11 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 7 insertions, 5 deletions
@@ -452,11 +452,12 @@ ifndef AVR_TOOLS_DIR else $(call show_config_variable,AVR_TOOLS_DIR,[USER]) - # Check in Windows as Cygwin is being used, that the configuration file for the AVRDUDE is set - # Check if it works on MAC - ifeq ($(CURRENT_OS),WINDOWS) - ifndef AVRDUDE_CONF - AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + # ensure we can still find avrdude.conf + ifndef AVRDUDE_CONF + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1) + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + else + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf endif endif @@ -18,6 +18,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Tweak: Updated Fedora instructions (https://github.com/sej7278) - Fix: Preserve original extension for object files, support asm sources in core, fixes pulseInASM (Issue #255, #364) (https://github.com/sej7278) - Fix: Make sure TARGET is set correctly when CURDIR contains spaces (https://github.com/svendahlstrand) +- Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278) ### 1.5 (2015-04-07) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e) |