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

Again fix mruby build properly; pass CC, CXX and LD to build_config.rb

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-05 18:22:46 +09:00
parent 6dcfe1c3f8
commit 69c3e2114a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -148,7 +148,8 @@ nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS}
nghttpx_LDADD = libnghttpx.a ${LDADD} nghttpx_LDADD = libnghttpx.a ${LDADD}
if HAVE_MRUBY if HAVE_MRUBY
nghttpx_CPPFLAGS += -I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@ libnghttpx_a_CPPFLAGS += \
-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
nghttpx_LDADD += -L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@ nghttpx_LDADD += -L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
endif # HAVE_MRUBY endif # HAVE_MRUBY

9
third-party/Makefile.am vendored
View File

@ -36,14 +36,15 @@ if HAVE_MRUBY
mruby: mruby:
git submodule update --init git submodule update --init
MRUBY_CONFIG=${srcdir}/build_config.rb \ MRUBY_CONFIG="${srcdir}/build_config.rb" \
BUILD_DIR=${abs_builddir}/mruby/build \ BUILD_DIR="${abs_builddir}/mruby/build" \
${srcdir}/mruby/minirake -f ${srcdir}/mruby/Rakefile CC="${CC}" CXX="${CXX}" LD="${LD}" \
"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"
all-local: mruby all-local: mruby
clean-local: clean-local:
-rm -rf ${abs_builddir}/mruby/build -rm -rf "${abs_builddir}/mruby/build"
endif # HAVE_MRUBY endif # HAVE_MRUBY