upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-10 09:21:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[CLEANUP] report dlmalloc's source path only if explictly specified

Browse source 
There's no point in reporting dlmalloc's source path if it was the
default one.
(cherry picked from commit f32d19a395)
This commit is contained in:
Willy Tarreau 2008-03-07 10:02:14 +01:00
parent c454c8f4df
commit 92bce7baeb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -341,6 +341,11 @@ OPTIONS_CFLAGS += -DCONFIG_HAP_USE_REGPARM
BUILD_OPTIONS += $(call ignore_implicit,USE_REGPARM)
endif
# report DLMALLOC_SRC only if explicitly specified
ifneq ($(DLMALLOC_SRC),)
BUILD_OPTIONS += DLMALLOC_SRC=$(DLMALLOC_SRC)
endif
ifneq ($(USE_DLMALLOC),)
BUILD_OPTIONS += $(call ignore_implicit,USE_DLMALLOC)
ifeq ($(DLMALLOC_SRC),)
@ -349,10 +354,9 @@ endif
endif
ifneq ($(DLMALLOC_SRC),)
# May be changed to match PAGE_SIZE on every platform
# DLMALLOC_THRES may be changed to match PAGE_SIZE on every platform
DLMALLOC_THRES = 4096
OPTIONS_OBJS += src/dlmalloc.o
BUILD_OPTIONS += DLMALLOC_SRC=$(DLMALLOC_SRC)
endif
ifneq ($(USE_PCRE),)