1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: fix jemalloc check

Browse Source 
* configure.in (jemalloc): check with JEMALLOC_MANGLE if not found
  without the mangling.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-08-11 01:40:23 +00:00
parent c7bc925b9b
commit b6d23e450b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.in
View File

@ -1159,11 +1159,26 @@ AC_ARG_WITH([jemalloc],
[AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])], [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
[with_jemalloc=yes], [with_jemalloc=no]) [with_jemalloc=yes], [with_jemalloc=no])
AS_IF([test "x$with_jemalloc" = xyes],[ AS_IF([test "x$with_jemalloc" = xyes],[
AC_CHECK_LIB([jemalloc],[malloc_conf],[], [with_jemalloc=no]) AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
AC_CHECK_HEADER(jemalloc/jemalloc.h, [ AC_CHECK_HEADER(jemalloc/jemalloc.h, [
AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>]) AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
])
AS_IF([test "x$with_jemalloc" = xno], [
AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
@%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
@%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
@%:@else
@%:@include <jemalloc.h>
@%:@endif], [return !&malloc_conf])],
[rb_cv_jemalloc_demangle=yes],
[rb_cv_jemalloc_demangle=no])
])
])
AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
AC_DEFINE(JEMALLOC_MANGLE) AC_DEFINE(JEMALLOC_MANGLE)
with_jemalloc=yes with_jemalloc=yes
LIBS="-ljemalloc $LIBS"
]) ])
AS_IF([test "x$with_jemalloc" = xyes], AS_IF([test "x$with_jemalloc" = xyes],
[ [