diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-12 13:53:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-12 13:53:03 -0700 |
| commit | 5879b6bbcaba7696e4abfa717748da166f915405 (patch) | |
| tree | 83c87b6b5c7ac72db60a027b3248e740f2f07f91 /Makefile | |
| parent | 5418d96ddca8134b5abeb99430f61c062d91f722 (diff) | |
| parent | e22148f406a7a31a25ebda01d21d9a4646ce82ea (diff) | |
| download | git-5879b6bbcaba7696e4abfa717748da166f915405.tar.gz git-5879b6bbcaba7696e4abfa717748da166f915405.tar.xz | |
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-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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) |