mirror of https://github.com/noisymime/Arduino.git
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 fc8cacb9a3
)
This commit is contained in:
parent
de4d73511d
commit
8efc3920f9
|
@ -57,8 +57,10 @@ AVRDUDE_CONF = -C$(TOOLROOT)/avr/etc/avrdude.conf
|
||||||
ifeq ($(OS), windows)
|
ifeq ($(OS), windows)
|
||||||
# On windows, SOME of the tool paths will need to have backslashes instead
|
# 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 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)
|
fixpath = $(subst /,\,$1)
|
||||||
|
SHELL = cmd.exe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
else ifeq ($(ENV), arduinodev)
|
else ifeq ($(ENV), arduinodev)
|
||||||
|
|
Loading…
Reference in New Issue