From 45d63d200650c7e3978146b030a9be3615f645e2 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 18 Apr 2019 22:45:02 +0900
Subject: [PATCH 1/2] Upgrade mruby to 2.0.1

---
 third-party/mruby | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From a69251864b378a7baebac60c82ec56d4b03129ae Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 18 Apr 2019 23:04:33 +0900
Subject: [PATCH 2/2] Fix mruby build error

mruby minirake does not like CXX="clang++-7 -std=c++14" because it
expects CXX to be an executable.  To workaround this, split CXX so
that CXX becomes a single word and move the rest of words to CXXFLAGS.
---
 third-party/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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"