Skip to content

Commit 78dbba7

Browse files
author
Quentin Boswank
committed
Updated Makefiles for full MSYS2 and Cygwin installation and testing support.
They are Linux-like environments under Windows and have all the tools needed to support staged installation and testing. Beware: this only affects the make build system.
1 parent d857369 commit 78dbba7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ clean:
151151
#------------------------------------------------------------------------------
152152
# make install is validated only for Linux, macOS, Hurd and some BSD targets
153153
#------------------------------------------------------------------------------
154-
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku AIX))
154+
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT CYGWIN_NT Haiku AIX))
155155

156156
HOST_OS = POSIX
157157

lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ clean:
249249
#-----------------------------------------------------------------------------
250250
# make install is validated only for below listed environments
251251
#-----------------------------------------------------------------------------
252-
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX))
252+
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT))
253253

254254
lib: libzstd.pc
255255

programs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ include $(wildcard $(DEPFILES))
346346
#-----------------------------------------------------------------------------
347347
# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
348348
#-----------------------------------------------------------------------------
349-
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX))
349+
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT))
350350

351351
HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
352352
EGREP_OPTIONS ?=

tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ clean:
263263
# valgrind tests validated only for some posix platforms
264264
#----------------------------------------------------------------------------------
265265
UNAME := $(shell uname)
266-
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX))
266+
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX CYGWIN_NT))
267267
HOST_OS = POSIX
268268

269269
.PHONY: test-valgrind

0 commit comments

Comments
 (0)