Skip to content

Commit cde5a30

Browse files
committed
Start supporting MSys2 in config.mak.uname
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 86f728c commit cde5a30

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

config.mak.uname

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,23 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
534534
INTERNAL_QSORT = YesPlease
535535
HAVE_LIBCHARSET_H = YesPlease
536536
NO_GETTEXT = YesPlease
537-
USE_LIBPCRE= YesPlease
538537
else
539-
NO_CURL = YesPlease
538+
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
539+
# MSys2
540+
CC = gcc
541+
htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
542+
prefix = /mingw32/
543+
INSTALL = /bin/install
544+
NO_R_TO_GCC_LINKER = YesPlease
545+
INTERNAL_QSORT = YesPlease
546+
HAVE_LIBCHARSET_H = YesPlease
547+
NO_GETTEXT = YesPlease
548+
USE_LIBPCRE= YesPlease
549+
NO_CURL =
550+
USE_NED_ALLOCATOR =
551+
else
552+
NO_CURL = YesPlease
553+
endif
540554
endif
541555
endif
542556
ifeq ($(uname_S),QNX)

0 commit comments

Comments
 (0)