config.mak.uname: supporting 64-bit MSys2
This just makes things compile, the test suite needs extra tender loving care in addition to this change. We will address these issues in later commits. While at it, also allow building MSys2 Git (i.e. a Git that uses MSys2's POSIX emulation layer). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 13, 2016 at 14:31 UTC
7b40ae86a3f51080ed3550b005fc974024b208fe
1 file changed
+11
-3
config.mak.uname
+11
-3
@@ -518,13 +518,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
518
NO_INET_NTOP = YesPlease
519
NO_POSIX_GOODIES = UnfortunatelyYes
520
DEFAULT_HELP_FORMAT = html
521
- COMPAT_CFLAGS += -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
521
+ COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
522
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
523
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
524
compat/win32/pthread.o compat/win32/syslog.o \
525
compat/win32/dirent.o
526
BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
527
- BASIC_LDFLAGS += -Wl,--large-address-aware
527
EXTLIBS += -lws2_32
528
GITLIBS += git.res
529
PTHREAD_LIBS =
@@ -545,8 +544,17 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
544
else
545
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
546
# MSys2
547
+ prefix = /usr/
548
+ ifeq (MINGW32,$(MSYSTEM))
549
+ prefix = /mingw32
550
+ endif
551
+ ifeq (MINGW64,$(MSYSTEM))
552
+ prefix = /mingw64
553
+ else
554
+ COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
555
+ BASIC_LDFLAGS += -Wl,--large-address-aware
556
+ endif
557
CC = gcc
549
- prefix = /mingw32
558
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
559
INSTALL = /bin/install
560
NO_R_TO_GCC_LINKER = YesPlease