diff options
| author | chrismas9 <c.mason@inchipdesign.com.au> | 2017-09-10 00:51:44 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-10-04 00:21:05 +1100 |
| commit | 3289b9b7a76a1230b6bb631e191a47bfc6c7a8ee (patch) | |
| tree | 9d0eb8a65f86b0327330e2a4a181394caed4baa2 /py/mkenv.mk | |
| parent | b00040c43c156faa3178b44f286f49183021c823 (diff) | |
py/{mkenv.mk,mkrules.mk}: Append .exe for Windows executable files.
Building mpy-cross: this patch adds .exe to the PROG name when building
executables for host (eg mpy-cross) on Windows. make clean now removes
mpy-cross.exe under Windows.
Building MicroPython: this patch sets MPY_CROSS to mpy-cross.exe or
mpy-cross so they can coexist and use cygwin or WSL without rebuilding
mpy-cross. The dependency in the mpy rule now uses mpy-cross.exe for
Windows and mpy-cross for Linux.
Diffstat (limited to 'py/mkenv.mk')
| -rw-r--r-- | py/mkenv.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/py/mkenv.mk b/py/mkenv.mk index b167b2533..8b637e9ac 100644 --- a/py/mkenv.mk +++ b/py/mkenv.mk @@ -59,7 +59,13 @@ LD += -m32 endif MAKE_FROZEN = $(TOP)/tools/make-frozen.py +# allow mpy-cross (for WSL) and mpy-cross.exe (for cygwin) to coexist +ifeq ($(OS),Windows_NT) +MPY_CROSS = $(TOP)/mpy-cross/mpy-cross.exe +PROG_EXT = .exe +else MPY_CROSS = $(TOP)/mpy-cross/mpy-cross +endif MPY_TOOL = $(TOP)/tools/mpy-tool.py all: |