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

Fix AVR_TOOLS_PATH and make sure OSTYPE is populated earlier.

Browse source
This commit is contained in:
Christopher Peplin 2012-04-02 17:01:41 -04:00
parent ece25aef75
commit ab5de3ae40
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arduino-mk/Arduino.mk
View file

@ -183,10 +183,12 @@ endif
# Some paths # Some paths
# #
OSTYPE := $(shell uname)
ifneq (ARDUINO_DIR,) ifneq (ARDUINO_DIR,)
ifndef AVR_TOOLS_PATH ifndef AVR_TOOLS_PATH
AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/avr/bin/ AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools
endif endif
ifndef ARDUINO_ETC_PATH ifndef ARDUINO_ETC_PATH
@ -316,7 +318,6 @@ AR := avr-ar
SIZE := avr-size SIZE := avr-size
NM := avr-nm NM := avr-nm
OSTYPE := $(shell uname)
ifneq ($(OSTYPE),Linux) ifneq ($(OSTYPE),Linux)
# Compilers distributed with the IDE in OS X and Windows, but not Linux # Compilers distributed with the IDE in OS X and Windows, but not Linux
CC := $(addprefix $(AVR_TOOLS_PATH),$(CC)) CC := $(addprefix $(AVR_TOOLS_PATH),$(CC))