diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 18:13:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 18:13:10 (GMT) |
| commit | 9166bca8ba1ac008d36886648a8a4cf1b38a53fe (patch) | |
| tree | 6c2e68519d8d2f8ab7a6295e73da38568824ec56 | |
| parent | 2794e813c64b7f8a4808246f1ae4448e8a26b165 (diff) | |
| parent | 2f0623aaa7bef3ec8f82014842f084dde3976569 (diff) | |
| download | git-9166bca8ba1ac008d36886648a8a4cf1b38a53fe.zip git-9166bca8ba1ac008d36886648a8a4cf1b38a53fe.tar.gz git-9166bca8ba1ac008d36886648a8a4cf1b38a53fe.tar.bz2 | |
Merge branch 'js/mingw-with-python' into maint
Conditionally allow building Python interpreter on Windows
source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
* 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.uname | 5 |
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 |