Use C++ compiler to detect mruby since we have to enable C++ ABI mode

Since default Debian/Ubuntu mruby package does not enable C++ ABI
mode, it cannot be used with our C++ code, since mruby exception does
not properly cleanup C++ object allocated on stack.  We have to build
mruby with conf.enable_cxx_abi explicitly.  It is safe for us to build
our own mruby.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-04 22:10:49 +09:00
parent d8ca0a8d47
commit 4872c9b4c9
1 changed files with 2 additions and 0 deletions

View File

@ -376,6 +376,7 @@ fi
AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ]) AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ])
# mruby (for src/nghttpx) # mruby (for src/nghttpx)
AC_LANG_PUSH(C++)
LIBS_OLD=$LIBS LIBS_OLD=$LIBS
have_mruby=no have_mruby=no
if test "x${request_mruby}" != "xno"; then if test "x${request_mruby}" != "xno"; then
@ -392,6 +393,7 @@ if test "x${request_mruby}" != "xno"; then
fi fi
fi fi
LIBS=$LIBS_OLD LIBS=$LIBS_OLD
AC_LANG_POP()
if test "x${request_mruby}" = "xyes" && if test "x${request_mruby}" = "xyes" &&
test "x${have_mruby}" != "xyes"; then test "x${have_mruby}" != "xyes"; then