aboutsummaryrefslogtreecommitdiff
path: root/py/mkenv.mk
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-10-31 22:01:56 +1100
committerDamien George <damien.p.george@gmail.com>2017-10-31 22:01:56 +1100
commit02b4b23319a84d5b96b9394d8c379ef0549fd208 (patch)
tree449a3ca8cae47602368779107acd5f2c24591158 /py/mkenv.mk
parentb81fbf938f1bb9cc798a3933476c80c0d9b83992 (diff)
Revert "py/{mkenv.mk,mkrules.mk}: Append .exe for Windows executable files."
This reverts commit 3289b9b7a76a1230b6bb631e191a47bfc6c7a8ee. The commit broke building on MINGW because the filename became micropython.exe.exe. A proper solution to support more Windows build environments requires more thought and testing.
Diffstat (limited to 'py/mkenv.mk')
-rw-r--r--py/mkenv.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/py/mkenv.mk b/py/mkenv.mk
index 8b637e9ac..b167b2533 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -59,13 +59,7 @@ 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: