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

Fix check for malloc_conf when no library is required

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-07-06 19:35:38 +09:00
parent c5e6fa4853
commit 166d148355
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -1303,8 +1303,11 @@ AS_IF([test "x$with_jemalloc" != xno],[
with_jemalloc=yes with_jemalloc=yes
], ],
[test x$with_jemalloc = xyes && with_jemalloc=no]) [test x$with_jemalloc = xyes && with_jemalloc=no])
AC_CHECK_HEADER(jemalloc/jemalloc.h, [ for malloc_header in jemalloc/jemalloc.h jemalloc.h; do
AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>]) AC_CHECK_HEADER($malloc_header, [break], [malloc_header=])
done
AS_IF([test "$malloc_header" != ""], [
AC_DEFINE_UNQUOTED(RUBY_ALTERNATIVE_MALLOC_HEADER, [<$malloc_header>])
], ],
[test x$with_jemalloc = xyes && with_jemalloc=no]) [test x$with_jemalloc = xyes && with_jemalloc=no])
AS_IF([test "x$with_jemalloc" != xyes], [ AS_IF([test "x$with_jemalloc" != xyes], [
@ -1313,7 +1316,7 @@ AS_IF([test "x$with_jemalloc" != xno],[
@%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER @%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
@%:@include RUBY_ALTERNATIVE_MALLOC_HEADER @%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
@%:@else @%:@else
@%:@include <jemalloc.h> extern const char *malloc_conf;
@%:@endif], [return !&malloc_conf])], @%:@endif], [return !&malloc_conf])],
[rb_cv_jemalloc_demangle=yes], [rb_cv_jemalloc_demangle=yes],
[rb_cv_jemalloc_demangle=no]) [rb_cv_jemalloc_demangle=no])