summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:13 (GMT)
commit8dfa09f49f58dc1458bea485789f5c07a48be9a3 (patch)
tree96ca36e0135041c151d6a50f04b87c56a994a49e
parent6d97f440e55bb4cfa3ab277876099568b2073c28 (diff)
parent2f0623aaa7bef3ec8f82014842f084dde3976569 (diff)
downloadgit-8dfa09f49f58dc1458bea485789f5c07a48be9a3.zip
git-8dfa09f49f58dc1458bea485789f5c07a48be9a3.tar.gz
git-8dfa09f49f58dc1458bea485789f5c07a48be9a3.tar.bz2
Merge branch 'js/mingw-with-python'
Conditionally allow building Python interpreter on Windows * 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
-rw-r--r--config.mak.uname5
1 files changed, 2 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname
index ce83cad..d63629f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -656,7 +656,6 @@ ifeq ($(uname_S),MINGW)
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease
- NO_PYTHON = YesPlease
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
@@ -686,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
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)
@@ -717,10 +717,8 @@ else
INSTALL = /bin/install
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
- NO_GETTEXT =
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease
- NO_CURL =
USE_NED_ALLOCATOR = YesPlease
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
@@ -730,6 +728,7 @@ else
else
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
NO_CURL = YesPlease
+ NO_PYTHON = YesPlease
endif
endif
endif