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

Fix mruby build 

Copy build_config.rb to build directory because now
build_config.rb.lock is created along side it.

Define toolchain depending on CC environment variable.
This commit is contained in:
Tatsuhiro Tsujikawa 2020-09-02 23:02:10 +09:00
parent 7df73a5d90
commit 181a007a34
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
third-party/Makefile.am vendored
View File

@ -54,7 +54,10 @@ EXTRA_DIST += build_config.rb mruby/*
.PHONY: all-local clean mruby .PHONY: all-local clean mruby
mruby: mruby:
MRUBY_CONFIG="${srcdir}/build_config.rb" \ mkdir -p "${abs_builddir}/mruby/build"
diff "${srcdir}/build_config.rb" "${abs_builddir}/mruby/build/build_config.rb" >& /dev/null || \
cp "${srcdir}/build_config.rb" "${abs_builddir}/mruby/build"
MRUBY_CONFIG="${abs_builddir}/mruby/build/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="$(firstword $(CXX))" LD="${LD}" \ CC="${CC}" CXX="$(firstword $(CXX))" LD="${LD}" \
@ -66,7 +69,7 @@ mruby:
all-local: mruby all-local: mruby
clean-local: clean-local:
MRUBY_CONFIG="${srcdir}/build_config.rb" \ MRUBY_CONFIG="${abs_builddir}/mruby/build/build_config.rb" \
BUILD_DIR="${abs_builddir}/mruby/build" \ BUILD_DIR="${abs_builddir}/mruby/build" \
"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" clean "${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" clean

4
third-party/build_config.rb vendored
View File

@ -1,6 +1,6 @@
MRuby::Build.new do |conf| MRuby::Build.new do |conf|
# TODO use same compilers configured in configure script toolchain :clang if ENV['CC'].include? "clang"
toolchain :clang toolchain :gcc if ENV['CC'].include? "gcc"
# C++ project needs this. Without this, mruby exception does not # C++ project needs this. Without this, mruby exception does not
# properly destory C++ object allocated on stack. # properly destory C++ object allocated on stack.