aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2025-04-23 08:01:45 +0000
committerJunio C Hamano <gitster@pobox.com>2025-04-23 09:11:31 -0700
commit734bf24007652703364f781097f295b57b0a338a (patch)
treefe4706384b4832768e13d2460ad57bb65b5c6e05
parentconfig.mak.uname: add support for clangarm64 (diff)
downloadgit-734bf24007652703364f781097f295b57b0a338a.tar.gz
git-734bf24007652703364f781097f295b57b0a338a.zip
mingw: do not use nedmalloc on Windows/ARM64
It does not compile there, and seeing as nedmalloc has been pretty much unmaintained since at least November 2017, as per https://github.com/ned14/nedmalloc/issues/20#issuecomment-343432314, there is also no hope that any fixes will materialize there. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> [jc: adjust config.mak.uname for c18400c6] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rw-r--r--config.mak.uname4
1 files changed, 3 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 1e5d89f1aa..3ec82d95e6 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -742,7 +742,9 @@ ifeq ($(uname_S),MINGW)
HAVE_LIBCHARSET_H = YesPlease
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease
- USE_NED_ALLOCATOR = YesPlease
+ ifneq (CLANGARM64,$(MSYSTEM))
+ USE_NED_ALLOCATOR = YesPlease
+ endif
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig