walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1337 from nghttp2/upgrade-mruby 

Upgrade mruby
This commit is contained in:
Tatsuhiro Tsujikawa 2019-04-18 23:37:18 +09:00 committed by GitHub
parent 3cdbc5f525 a69251864b
commit 302e37460f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
third-party/Makefile.am vendored
View File

@ -49,8 +49,9 @@ mruby:
MRUBY_CONFIG="${srcdir}/build_config.rb" \ MRUBY_CONFIG="${srcdir}/build_config.rb" \
BUILD_DIR="${abs_builddir}/mruby/build" \ BUILD_DIR="${abs_builddir}/mruby/build" \
INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \ INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \
CC="${CC}" CXX="${CXX}" LD="${LD}" \ CC="${CC}" CXX="$(firstword $(CXX))" LD="${LD}" \
CFLAGS="${CPPFLAGS} ${CFLAGS}" CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \ CFLAGS="${CPPFLAGS} ${CFLAGS}" \
CXXFLAGS="$(wordlist 2, $(words $(CXX)), $(CXX)) ${CPPFLAGS} ${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \ LDFLAGS="${LDFLAGS}" \
"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" "${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"

2
third-party/mruby vendored

@ -1 +1 @@
Subproject commit 1c09046c13fc0a763583c6da0f1d350f6c41c4ca Subproject commit 7c91efc1ffda769a5f1a872c646c82b00698f1b8