summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-01-13 14:31:01 +0100
committerJunio C Hamano <gitster@pobox.com>2016-01-13 11:26:35 -0800
commit7b40ae86a3f51080ed3550b005fc974024b208fe (patch)
treec79319292c8b3c18f4ffbdccd7b90b83497e2c66
parentdf5218b4c30b2fa1ba0d1ada4166ad85bc83be26 (diff)
downloadgit-7b40ae86a3f51080ed3550b005fc974024b208fe.tar.gz
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>
-rw-r--r--config.mak.uname14
1 files changed, 11 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname
index b0592c15cc..4b2e1b807f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -518,13 +518,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_INET_NTOP = YesPlease
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
- COMPAT_CFLAGS += -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
+ COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
- BASIC_LDFLAGS += -Wl,--large-address-aware
EXTLIBS += -lws2_32
GITLIBS += git.res
PTHREAD_LIBS =
@@ -545,8 +544,17 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
else
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
# MSys2
+ prefix = /usr/
+ ifeq (MINGW32,$(MSYSTEM))
+ prefix = /mingw32
+ endif
+ ifeq (MINGW64,$(MSYSTEM))
+ prefix = /mingw64
+ else
+ COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
+ BASIC_LDFLAGS += -Wl,--large-address-aware
+ endif
CC = gcc
- prefix = /mingw32
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
INSTALL = /bin/install
NO_R_TO_GCC_LINKER = YesPlease