RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUILD] ensure that makefile understands USE_DLMALLOC=1 

USE_DLMALLOC=1 was ignored since last makefile update. It's better
to keep it running for existing setups.
This commit is contained in:
Willy Tarreau 2008-02-19 10:53:32 +01:00
parent 6054819a70
commit f14358bd1a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -6,6 +6,7 @@
# Valid USE_* options are the following. Most of them are automatically set by # Valid USE_* options are the following. Most of them are automatically set by
# the TARGET, others have to be explictly specified : # the TARGET, others have to be explictly specified :
# USE_CTTPROXY : enable CTTPROXY on Linux (needs kernel patch). # USE_CTTPROXY : enable CTTPROXY on Linux (needs kernel patch).
# USE_DLMALLOC : enable use of dlmalloc (see DLMALLOC_SRC)
# USE_EPOLL : enable epoll() on Linux 2.6. Automatic. # USE_EPOLL : enable epoll() on Linux 2.6. Automatic.
# USE_EPOLL_WORKAROUND : enable epoll() bug workaround. Automatic. # USE_EPOLL_WORKAROUND : enable epoll() bug workaround. Automatic.
# USE_GETSOCKNAME : enable getsockname() on Linux 2.2. Automatic. # USE_GETSOCKNAME : enable getsockname() on Linux 2.2. Automatic.
@ -346,6 +347,13 @@ OPTIONS_CFLAGS += -DCONFIG_HAP_USE_REGPARM
BUILD_OPTIONS += $(call ignore_implicit,USE_REGPARM) BUILD_OPTIONS += $(call ignore_implicit,USE_REGPARM)
endif endif
ifneq ($(USE_DLMALLOC),)
BUILD_OPTIONS += $(call ignore_implicit,USE_DLMALLOC)
ifeq ($(DLMALLOC_SRC),)
DLMALLOC_SRC=src/dlmalloc.c
endif
endif
ifneq ($(DLMALLOC_SRC),) ifneq ($(DLMALLOC_SRC),)
# May be changed to match PAGE_SIZE on every platform # May be changed to match PAGE_SIZE on every platform
DLMALLOC_THRES = 4096 DLMALLOC_THRES = 4096