diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Sun Dec 21 08:35:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (jemalloc): fix option argument, should use + `$withval` but not `yes` always. [ruby-core:66994] [Bug #10625] + + * configure.in (jemalloc): defer adding the liner option to get + rid of linking contest against jemalloc, so that it works + without runtime dynamic load path. + Sat Dec 20 17:49:03 2014 Tanaka Akira <akr@fsij.org> * lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1. diff --git a/configure.in b/configure.in index e132076d65..9bcd684752 100644 --- a/configure.in +++ b/configure.in @@ -1204,7 +1204,7 @@ AS_IF([test "x$with_gmp" != xno], AC_ARG_WITH([jemalloc], [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])], - [with_jemalloc=yes], [with_jemalloc=no]) + [with_jemalloc=$withval], [with_jemalloc=no]) AS_IF([test "x$with_jemalloc" = xyes],[ AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no]) AC_CHECK_HEADER(jemalloc/jemalloc.h, [ @@ -1225,7 +1225,6 @@ AS_IF([test "x$with_jemalloc" = xyes],[ AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [ AC_DEFINE(JEMALLOC_MANGLE) with_jemalloc=yes - LIBS="-ljemalloc $LIBS" ]) AS_IF([test "x$with_jemalloc" = xyes], [ @@ -3769,6 +3768,9 @@ AS_CASE(["$target_os"], AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [], [SOLIBS="-lgmp $SOLIBS"]) +AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [], + [LIBS="-ljemalloc $LIBS"]) + MINIOBJS="$MINIDLNOBJ" AS_CASE(["$THREAD_MODEL"], |