aboutsummaryrefslogtreecommitdiff
path: root/mpy-cross/Makefile
diff options
context:
space:
mode:
authorstijn2016-07-25 14:45:57 +0200
committerPaul Sokolovsky2016-07-30 21:15:45 +0300
commit37b143ce9ef761f4f0648bae447617f019fc34e1 (patch)
treee50fbae27a64257624dff8897c81738e95eb7c62 /mpy-cross/Makefile
parent61e77a4e88c4b6971fd997191de01e5ab08e46c5 (diff)
mpy-cross: Fix mingw and msys2 compilation
When compiling with msys2's gcc there's no need to apply the binary fmode so adjust the Makefile to reflect that. When compiling with mingw we need to include malloc.h since there is no alloca.h, and the 64bit detection in mpconfigport.h needs some adjustment.
Diffstat (limited to 'mpy-cross/Makefile')
-rw-r--r--mpy-cross/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index ecf26ee31..3f9956620 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -50,7 +50,9 @@ SRC_C = \
gccollect.c \
ifeq ($(OS),Windows_NT)
-SRC_C += windows/fmode.c
+ ifeq (,$(findstring MSYS,$(UNAME_S)))
+ SRC_C += windows/fmode.c
+ endif
endif
OBJ = $(PY_O)