diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-17 22:07:55 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-17 22:07:55 +0000 |
| commit | d79405ff26e79666bd14e72e6e91452c766969f9 (patch) | |
| tree | c537ec86c5d856dc169bc19a09d8b889e22dd85a | |
| parent | fb70fc4af2b4bfe221c70608998c7e9661dd84f3 (diff) | |
merge revision(s) 66779: [Backport #15520]
configure: refuse to build with jemalloc when header is missing
[ruby-core:90964] [Bug #15520]
Freom: Misty De Meo <mistydemeo@github.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4e3f1ef0e5..2c4d2888d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,7 +1102,8 @@ AS_IF([test "x$with_jemalloc" != xno],[ [test x$with_jemalloc = xyes && with_jemalloc=no]) AC_CHECK_HEADER(jemalloc/jemalloc.h, [ AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>]) - ]) + ], + [test x$with_jemalloc = xyes && with_jemalloc=no]) AS_IF([test "x$with_jemalloc" != xyes], [ AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle, [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.0" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 20 +#define RUBY_PATCHLEVEL 21 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 1 |