From 4b7c12b7cbd7a9575814040da1d182106638e9c0 Mon Sep 17 00:00:00 2001
From: WestfW <westfw@gmail.com>
Date: Wed, 5 Oct 2011 01:41:03 -0700
Subject: Explicitly set the SHELL variable when OS=windows, so that we'll use
 the same shell regardless of whether other shells are installed (different
 shells have different behavior WRT directory component separators, so this
 matters.

http://code.google.com/p/arduino/issues/detail?id=667 )
---
 bootloaders/optiboot/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bootloaders')

diff --git a/bootloaders/optiboot/Makefile b/bootloaders/optiboot/Makefile
index c2e03e3..b9f3ed5 100644
--- a/bootloaders/optiboot/Makefile
+++ b/bootloaders/optiboot/Makefile
@@ -57,8 +57,10 @@ AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
 ifeq ($(OS), windows)
 # On windows, SOME of the tool paths will need to have backslashes instead
 # of forward slashes (because they use windows cmd.exe for execution instead
-# of a unix/mingw shell?)
+# of a unix/mingw shell?)  We also have to ensure that a consistent shell
+# is used even if a unix shell is installed (ie as part of WINAVR)
 fixpath = $(subst /,\,$1)
+SHELL = cmd.exe
 endif
 
 else ifeq ($(ENV), arduinodev)
-- 
cgit v1.2.3-18-g5258