Skip to content

Commit d3bed62

Browse files
WestfWdamellis
authored andcommitted
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 ) (cherry picked from commit fc8cacb9a3b7c1d9cf96ae9891c7c3cd21f3c181)
1 parent 915ea3b commit d3bed62

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

bootloaders/optiboot/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
5757
ifeq ($(OS), windows)
5858
# On windows, SOME of the tool paths will need to have backslashes instead
5959
# of forward slashes (because they use windows cmd.exe for execution instead
60-
# of a unix/mingw shell?)
60+
# of a unix/mingw shell?) We also have to ensure that a consistent shell
61+
# is used even if a unix shell is installed (ie as part of WINAVR)
6162
fixpath = $(subst /,\,$1)
63+
SHELL = cmd.exe
6264
endif
6365

6466
else ifeq ($(ENV), arduinodev)

0 commit comments

Comments
 (0)