dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #385 from sej7278/master

Browse source 
Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is manually set
This commit is contained in:
Simon John 2015-09-14 23:50:41 +01:00
commit 3198aeab40
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Arduino.mk
View file

@ -452,11 +452,12 @@ ifndef AVR_TOOLS_DIR
else else
$(call show_config_variable,AVR_TOOLS_DIR,[USER]) $(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 # ensure we can still find avrdude.conf
# Check if it works on MAC
ifeq ($(CURRENT_OS),WINDOWS)
ifndef AVRDUDE_CONF ifndef AVRDUDE_CONF
ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1)
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
else
AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf
endif endif
endif endif

1
HISTORY.md
View file

@ -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) - 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: 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: 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) ### 1.5 (2015-04-07)
- New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)