diff options
| author | WestfW <westfw@gmail.com> | 2011-10-05 01:41:03 -0700 |
|---|---|---|
| committer | David A. Mellis <d.mellis@arduino.cc> | 2011-10-10 12:11:18 -0400 |
| commit | d3bed622e8a2808bd8c8c770bff8b8e67f69272d (patch) | |
| tree | e5e1409676be8ebb586e886c19a22adf9e5fa96e | |
| parent | 915ea3be2a6f453a9ab5f6c248e6695a3e74bf0f (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 )
(cherry picked from commit fc8cacb9a3b7c1d9cf96ae9891c7c3cd21f3c181)
| -rw-r--r-- | bootloaders/optiboot/Makefile | 4 |
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) |