diff options
| author | Dan Gudmundsson <[email protected]> | 2015-10-27 09:57:43 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-10-27 09:57:43 +0100 |
| commit | 47996010a0413f984c8312bb525d96ada3c91cf7 (patch) | |
| tree | 8784de6528cd2709f60e90b063684fe1be671997 /erts/etc/win32/nsis | |
| parent | 7908256c72e4a110154c2db61220973fff511614 (diff) | |
| parent | 4a9f688b804688ff95e256d3412ca932b9972d8a (diff) | |
| download | otp-47996010a0413f984c8312bb525d96ada3c91cf7.tar.gz otp-47996010a0413f984c8312bb525d96ada3c91cf7.tar.bz2 otp-47996010a0413f984c8312bb525d96ada3c91cf7.zip | |
Merge branch 'dgud/msys2-fixes' into maint
* dgud/msys2-fixes:
erts: Detect and build on MSYS2 for windows
Diffstat (limited to 'erts/etc/win32/nsis')
| -rw-r--r-- | erts/etc/win32/nsis/Makefile | 10 |
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 "")) |