@@ -623,6 +623,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
623
623
SHELL_PATH = /usr/coreutils/bin/bash
624
624
endif
625
625
ifeq ($(uname_S),MINGW)
626
+ ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
627
+ $(error "Building with MSys is no longer supported")
628
+ endif
626
629
pathsep = ;
627
630
HAVE_ALLOCA_H = YesPlease
628
631
NO_PREAD = YesPlease
@@ -676,61 +679,43 @@ ifeq ($(uname_S),MINGW)
676
679
RC = windres -O coff
677
680
NATIVE_CRLF = YesPlease
678
681
X = .exe
679
- ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
680
- htmldir = doc/git/html/
681
- prefix =
682
+ # MSys2
683
+ prefix = /usr/
684
+ # Enable DEP
685
+ BASIC_LDFLAGS += -Wl,--nxcompat
686
+ # Enable ASLR (unless debugging)
687
+ ifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))
688
+ BASIC_LDFLAGS += -Wl,--dynamicbase
689
+ endif
690
+ ifeq (MINGW32,$(MSYSTEM))
691
+ prefix = /mingw32
692
+ HOST_CPU = i686
693
+ BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
694
+ endif
695
+ ifeq (MINGW64,$(MSYSTEM))
696
+ prefix = /mingw64
697
+ HOST_CPU = x86_64
698
+ BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
699
+ else
700
+ COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
701
+ BASIC_LDFLAGS += -Wl,--large-address-aware
702
+ endif
703
+ CC = gcc
704
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
705
+ -fstack-protector-strong
706
+ EXTLIBS += -lntdll
682
707
INSTALL = /bin/install
683
- EXTLIBS += /mingw/lib/libz.a
684
708
INTERNAL_QSORT = YesPlease
685
709
HAVE_LIBCHARSET_H = YesPlease
686
- NO_GETTEXT = YesPlease
687
- NO_PYTHON = YesPlease
688
- COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
689
- else
690
- ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
691
- # MSys2
692
- prefix = /usr/
693
- # Enable DEP
694
- BASIC_LDFLAGS += -Wl,--nxcompat
695
- # Enable ASLR (unless debugging)
696
- ifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))
697
- BASIC_LDFLAGS += -Wl,--dynamicbase
698
- endif
699
- ifeq (MINGW32,$(MSYSTEM))
700
- prefix = /mingw32
701
- HOST_CPU = i686
702
- BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
703
- endif
704
- ifeq (MINGW64,$(MSYSTEM))
705
- prefix = /mingw64
706
- HOST_CPU = x86_64
707
- BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
708
- else
709
- COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
710
- BASIC_LDFLAGS += -Wl,--large-address-aware
711
- endif
712
- CC = gcc
713
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
714
- -fstack-protector-strong
715
- EXTLIBS += -lntdll
716
- INSTALL = /bin/install
717
- INTERNAL_QSORT = YesPlease
718
- HAVE_LIBCHARSET_H = YesPlease
719
- USE_GETTEXT_SCHEME = fallthrough
720
- USE_LIBPCRE = YesPlease
721
- USE_NED_ALLOCATOR = YesPlease
722
- ifeq (/mingw64,$(subst 32,64,$(prefix)))
723
- # Move system config into top-level /etc/
724
- ETC_GITCONFIG = ../etc/gitconfig
725
- ETC_GITATTRIBUTES = ../etc/gitattributes
726
- endif
727
- else
728
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
729
- NO_CURL = YesPlease
730
- NO_PYTHON = YesPlease
710
+ USE_GETTEXT_SCHEME = fallthrough
711
+ USE_LIBPCRE = YesPlease
712
+ USE_NED_ALLOCATOR = YesPlease
713
+ ifeq (/mingw64,$(subst 32,64,$(prefix)))
714
+ # Move system config into top-level /etc/
715
+ ETC_GITCONFIG = ../etc/gitconfig
716
+ ETC_GITATTRIBUTES = ../etc/gitattributes
731
717
endif
732
718
endif
733
- endif
734
719
ifeq ($(uname_S),QNX)
735
720
COMPAT_CFLAGS += -DSA_RESTART=0
736
721
EXPAT_NEEDS_XMLPARSE_H = YesPlease
0 commit comments