Skip to content

Commit 9166bca

Browse files
committed
Merge branch 'js/mingw-with-python' into maint
Conditionally allow building Python interpreter on Windows source: <[email protected]> * js/mingw-with-python: mingw: remove unneeded `NO_CURL` directive mingw: remove unneeded `NO_GETTEXT` directive windows: include the Python bits when building Git for Windows
2 parents 2794e81 + 2f0623a commit 9166bca

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

config.mak.uname

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ ifeq ($(uname_S),MINGW)
656656
UNRELIABLE_FSTAT = UnfortunatelyYes
657657
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
658658
NO_REGEX = YesPlease
659-
NO_PYTHON = YesPlease
660659
ETAGS_TARGET = ETAGS
661660
NO_POSIX_GOODIES = UnfortunatelyYes
662661
DEFAULT_HELP_FORMAT = html
@@ -686,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
686685
INTERNAL_QSORT = YesPlease
687686
HAVE_LIBCHARSET_H = YesPlease
688687
NO_GETTEXT = YesPlease
688+
NO_PYTHON = YesPlease
689689
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
690690
else
691691
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
@@ -717,10 +717,8 @@ else
717717
INSTALL = /bin/install
718718
INTERNAL_QSORT = YesPlease
719719
HAVE_LIBCHARSET_H = YesPlease
720-
NO_GETTEXT =
721720
USE_GETTEXT_SCHEME = fallthrough
722721
USE_LIBPCRE = YesPlease
723-
NO_CURL =
724722
USE_NED_ALLOCATOR = YesPlease
725723
ifeq (/mingw64,$(subst 32,64,$(prefix)))
726724
# Move system config into top-level /etc/
@@ -730,6 +728,7 @@ else
730728
else
731729
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
732730
NO_CURL = YesPlease
731+
NO_PYTHON = YesPlease
733732
endif
734733
endif
735734
endif

0 commit comments

Comments
 (0)