From ab5de3ae404ac59abe720f1fc6f24b932fac7b29 Mon Sep 17 00:00:00 2001
From: Christopher Peplin <cpeplin@ford.com>
Date: Mon, 2 Apr 2012 17:01:41 -0400
Subject: [PATCH] Fix AVR_TOOLS_PATH and make sure OSTYPE is populated earlier.

---
 arduino-mk/Arduino.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 41c78c4..4f8b3bd 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -183,10 +183,12 @@ endif
 # Some paths
 #
 
+OSTYPE := $(shell uname)
+
 ifneq (ARDUINO_DIR,)
 
 ifndef AVR_TOOLS_PATH
-AVR_TOOLS_PATH    = $(ARDUINO_DIR)/hardware/tools/avr/bin/
+AVR_TOOLS_PATH    = $(ARDUINO_DIR)/hardware/tools
 endif
 
 ifndef ARDUINO_ETC_PATH
@@ -316,7 +318,6 @@ AR      := avr-ar
 SIZE    := avr-size
 NM      := avr-nm
 
-OSTYPE := $(shell uname)
 ifneq ($(OSTYPE),Linux)
 # Compilers distributed with the IDE in OS X and Windows, but not Linux
 CC      := $(addprefix $(AVR_TOOLS_PATH),$(CC))