aboutsummaryrefslogtreecommitdiff
path: root/bootloaders
diff options
context:
space:
mode:
authorWestfW <westfw@gmail.com>2011-10-05 01:41:03 -0700
committerWestfW <westfw@gmail.com>2011-10-05 01:41:03 -0700
commit4b7c12b7cbd7a9575814040da1d182106638e9c0 (patch)
tree5214e7409668fbcb37a30fbc0cc3f8ef7ec3c7bf /bootloaders
parent8628479d7039247395bea6ea6f0c8bdab8f696bc (diff)
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 )
Diffstat (limited to 'bootloaders')
-rw-r--r--bootloaders/optiboot/Makefile4
1 files changed, 3 insertions, 1 deletions
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)