Merge branch 'hj/remove-msys-support'
Remove support for MSys, which now lags way behind MSys2. * hj/remove-msys-support: mingw: remove msysGit/MSYS1 support mingw: remove duplicate `USE_NED_ALLOCATOR` directive
This commit is contained in:
commit
4158b92f16
@ -624,6 +624,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
|
||||
SHELL_PATH = /usr/coreutils/bin/bash
|
||||
endif
|
||||
ifeq ($(uname_S),MINGW)
|
||||
ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
|
||||
$(error "Building with MSys is no longer supported")
|
||||
endif
|
||||
pathsep = ;
|
||||
HAVE_ALLOCA_H = YesPlease
|
||||
NO_PREAD = YesPlease
|
||||
@ -653,7 +656,6 @@ ifeq ($(uname_S),MINGW)
|
||||
USE_WIN32_IPC = YesPlease
|
||||
USE_WIN32_MMAP = YesPlease
|
||||
MMAP_PREVENTS_DELETE = UnfortunatelyYes
|
||||
USE_NED_ALLOCATOR = YesPlease
|
||||
UNRELIABLE_FSTAT = UnfortunatelyYes
|
||||
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
|
||||
NO_REGEX = YesPlease
|
||||
@ -678,18 +680,6 @@ ifeq ($(uname_S),MINGW)
|
||||
RC = windres -O coff
|
||||
NATIVE_CRLF = YesPlease
|
||||
X = .exe
|
||||
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
|
||||
htmldir = doc/git/html/
|
||||
prefix =
|
||||
INSTALL = /bin/install
|
||||
EXTLIBS += /mingw/lib/libz.a
|
||||
INTERNAL_QSORT = YesPlease
|
||||
HAVE_LIBCHARSET_H = YesPlease
|
||||
NO_GETTEXT = YesPlease
|
||||
NO_PYTHON = YesPlease
|
||||
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
|
||||
else
|
||||
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
|
||||
# MSys2
|
||||
prefix = /usr/
|
||||
# Enable DEP
|
||||
@ -726,12 +716,6 @@ else
|
||||
ETC_GITCONFIG = ../etc/gitconfig
|
||||
ETC_GITATTRIBUTES = ../etc/gitattributes
|
||||
endif
|
||||
else
|
||||
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
|
||||
NO_CURL = YesPlease
|
||||
NO_PYTHON = YesPlease
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(uname_S),QNX)
|
||||
COMPAT_CFLAGS += -DSA_RESTART=0
|
||||
|
Loading…
Reference in New Issue
Block a user