summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-12 20:53:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-12 20:53:03 (GMT)
commit5879b6bbcaba7696e4abfa717748da166f915405 (patch)
tree83c87b6b5c7ac72db60a027b3248e740f2f07f91 /Makefile
parent5418d96ddca8134b5abeb99430f61c062d91f722 (diff)
parente22148f406a7a31a25ebda01d21d9a4646ce82ea (diff)
downloadgit-5879b6bbcaba7696e4abfa717748da166f915405.zip
git-5879b6bbcaba7696e4abfa717748da166f915405.tar.gz
git-5879b6bbcaba7696e4abfa717748da166f915405.tar.bz2
Merge branch 'maint'
* maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c27e8bc..b7a62cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1465,7 +1465,7 @@ ifdef NO_REGEX
endif
ifdef USE_NED_ALLOCATOR
- COMPAT_CFLAGS += -DUSE_NED_ALLOCATOR -DOVERRIDE_STRDUP -DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR -Icompat/nedmalloc
+ COMPAT_CFLAGS += -Icompat/nedmalloc
COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
endif
@@ -1908,6 +1908,11 @@ ifdef NO_REGEX
compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
endif
+ifdef USE_NED_ALLOCATOR
+compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
+ -DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+endif
+
git-%$X: %.o $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)