diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index ebc49458..61b03b11 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -49,8 +49,9 @@ mruby:
 	MRUBY_CONFIG="${srcdir}/build_config.rb" \
 	BUILD_DIR="${abs_builddir}/mruby/build" \
 	INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \
-	CC="${CC}" CXX="${CXX}" LD="${LD}" \
-	CFLAGS="${CPPFLAGS} ${CFLAGS}" CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
+	CC="${CC}" CXX="$(firstword $(CXX))" LD="${LD}" \
+	CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+	CXXFLAGS="$(wordlist 2, $(words $(CXX)), $(CXX)) ${CPPFLAGS} ${CXXFLAGS}" \
 	LDFLAGS="${LDFLAGS}" \
 	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"
 
diff --git a/third-party/mruby b/third-party/mruby
index 1c09046c..7c91efc1 160000
--- a/third-party/mruby
+++ b/third-party/mruby
@@ -1 +1 @@
-Subproject commit 1c09046c13fc0a763583c6da0f1d350f6c41c4ca
+Subproject commit 7c91efc1ffda769a5f1a872c646c82b00698f1b8