aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/win32/nsis/Makefile
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-09-28 12:34:53 +0200
committerDan Gudmundsson <[email protected]>2015-10-22 14:17:57 +0200
commit4a9f688b804688ff95e256d3412ca932b9972d8a (patch)
treee3691d22889979a0c5835ab5ca4ef0efb198f73f /erts/etc/win32/nsis/Makefile
parent1523be48ab4071b158412f4b06fe9c8d6ba3e73c (diff)
downloadotp-4a9f688b804688ff95e256d3412ca932b9972d8a.tar.gz
otp-4a9f688b804688ff95e256d3412ca932b9972d8a.tar.bz2
otp-4a9f688b804688ff95e256d3412ca932b9972d8a.zip
erts: Detect and build on MSYS2 for windows
Allow building win32 on MSYS2. Avoid msys2 path conversion which does not work. And print the real windows command when something fails.
Diffstat (limited to 'erts/etc/win32/nsis/Makefile')
-rw-r--r--erts/etc/win32/nsis/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index 49d835170a..64f44ff86d 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -42,7 +42,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
TARGET_DIR = $(RELEASE_PATH)
-ifeq ($(MSYSTEM),MINGW32)
+ifdef MSYSTEM
+ ifeq ($(MSYSTEM),$(filter $(MSYSTEM),MSYS MINGW32 MINGW64))
+ USEMSYS := true
+ endif
+endif
+
+ifeq ($(USEMSYS),true)
MAKENSISFLAGS = //V2
WTESTROOT=$(shell (msys2win_path.sh "$(RELEASE_PATH)"))
@@ -63,7 +69,7 @@ else
endif
REDIST_FILE=$(shell (sh ./find_redist.sh || echo ""))
-ifeq ($(MSYSTEM),MINGW32)
+ifeq ($(USEMSYS),true)
NICEREDISTFILE=$(shell (msys2win_path.sh -m "$(REDIST_FILE)" 2>/dev/null || echo ""))
else
NICEREDISTFILE=$(shell (cygpath -d -m "$(REDIST_FILE)" 2>/dev/null || echo ""))