mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 11:18:51 +02:00
configure: Add -ljemalloc to LIBS; fix byzantine allocator linkages.
This commit is contained in:
parent
6c443361bc
commit
90d4d8248c
4 changed files with 1 additions and 9 deletions
|
@ -2185,7 +2185,6 @@ dnl
|
||||||
AC_SUBST(MALLOC_CPPFLAGS)
|
AC_SUBST(MALLOC_CPPFLAGS)
|
||||||
AC_SUBST(MALLOC_CXXFLAGS)
|
AC_SUBST(MALLOC_CXXFLAGS)
|
||||||
AC_SUBST(MALLOC_LDFLAGS)
|
AC_SUBST(MALLOC_LDFLAGS)
|
||||||
AC_SUBST(MALLOC_LIBS)
|
|
||||||
alloc_lib="standard"
|
alloc_lib="standard"
|
||||||
|
|
||||||
dnl ALLOC_LIBS true unless --disable-alloc-libs configured
|
dnl ALLOC_LIBS true unless --disable-alloc-libs configured
|
||||||
|
@ -2194,7 +2193,7 @@ AM_COND_IF([MALLOC_LIBS],
|
||||||
AM_COND_IF([JEMALLOC],
|
AM_COND_IF([JEMALLOC],
|
||||||
[
|
[
|
||||||
alloc_lib="jemalloc"
|
alloc_lib="jemalloc"
|
||||||
MALLOC_LIBS+=" -ljemalloc"
|
RB_VAR_PREPEND([LIBS], ["-ljemalloc"])
|
||||||
AC_DEFINE(IRCD_ALLOCATOR_USE_JEMALLOC, 1, [Use jemalloc as the allocator])
|
AC_DEFINE(IRCD_ALLOCATOR_USE_JEMALLOC, 1, [Use jemalloc as the allocator])
|
||||||
], [
|
], [
|
||||||
AC_DEFINE(IRCD_ALLOCATOR_USE_DEFAULT, 1, [Use the default allocator])
|
AC_DEFINE(IRCD_ALLOCATOR_USE_DEFAULT, 1, [Use the default allocator])
|
||||||
|
|
|
@ -50,7 +50,6 @@ construct_LDFLAGS = \
|
||||||
@BOOST_LDFLAGS@ \
|
@BOOST_LDFLAGS@ \
|
||||||
@SSL_LDFLAGS@ \
|
@SSL_LDFLAGS@ \
|
||||||
@CRYPTO_LDFLAGS@ \
|
@CRYPTO_LDFLAGS@ \
|
||||||
@MALLOC_LDFLAGS@ \
|
|
||||||
###
|
###
|
||||||
|
|
||||||
construct_LDADD = \
|
construct_LDADD = \
|
||||||
|
@ -58,7 +57,6 @@ construct_LDADD = \
|
||||||
@BOOST_LIBS@ \
|
@BOOST_LIBS@ \
|
||||||
@SSL_LIBS@ \
|
@SSL_LIBS@ \
|
||||||
@CRYPTO_LIBS@ \
|
@CRYPTO_LIBS@ \
|
||||||
@MALLOC_LIBS@ \
|
|
||||||
$(EXTRA_LIBS) \
|
$(EXTRA_LIBS) \
|
||||||
###
|
###
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,6 @@ libircd_la_LIBADD = \
|
||||||
@SNAPPY_LIBS@ \
|
@SNAPPY_LIBS@ \
|
||||||
@LZ4_LIBS@ \
|
@LZ4_LIBS@ \
|
||||||
@Z_LIBS@ \
|
@Z_LIBS@ \
|
||||||
@MALLOC_LIBS@ \
|
|
||||||
$(EXTRA_LIBS) \
|
$(EXTRA_LIBS) \
|
||||||
###
|
###
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,6 @@ AM_LDFLAGS = \
|
||||||
$(EXTRA_LDFLAGS) \
|
$(EXTRA_LDFLAGS) \
|
||||||
###
|
###
|
||||||
|
|
||||||
AM_LIBS = \
|
|
||||||
-lircd \
|
|
||||||
###
|
|
||||||
|
|
||||||
if GCC
|
if GCC
|
||||||
AM_CXXFLAGS += -ftls-model=local-dynamic
|
AM_CXXFLAGS += -ftls-model=local-dynamic
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue