Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build_config/host-f32.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MRuby::Build.new do |conf|
# MRB_USE_FLOAT32 build in a dedicated build directory (build/host-f32) so it
# does not clobber a normal host build.
MRuby::Build.new('host-f32') do |conf|
# load specific toolchain settings
toolchain :gcc

Expand Down
4 changes: 3 additions & 1 deletion build_config/host-gprof.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MRuby::Build.new do |conf|
# gprof build in a dedicated build directory (build/host-gprof) so it does not
# clobber a normal host build.
MRuby::Build.new('host-gprof') do |conf|
# load specific toolchain settings
toolchain :gcc

Expand Down
4 changes: 3 additions & 1 deletion build_config/host-m32-f32.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MRuby::Build.new do |conf|
# 32-bit MRB_USE_FLOAT32 build in a dedicated build directory
# (build/host-m32-f32) so it does not clobber a normal host build.
MRuby::Build.new('host-m32-f32') do |conf|
# load specific toolchain settings
toolchain :gcc

Expand Down
4 changes: 3 additions & 1 deletion build_config/host-m32.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MRuby::Build.new do |conf|
# 32-bit build in a dedicated build directory (build/host-m32) so it does not
# clobber a normal host build.
MRuby::Build.new('host-m32') do |conf|
# load specific toolchain settings
toolchain :gcc

Expand Down
7 changes: 6 additions & 1 deletion build_config/host-nofloat.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MRuby::Build.new do |conf|
# MRB_NO_FLOAT build in a dedicated build directory (build/host-nofloat) so it
# does not clobber a normal host build.
MRuby::Build.new('host-nofloat') do |conf|
# load specific toolchain settings
toolchain :gcc

Expand All @@ -8,6 +10,9 @@
conf.gembox "stdlib-io"
conf.gembox "metaprog"

# none of the gemboxes above supplies mrbc, and a build that is not named
# 'host' cannot borrow one from a 'host' target that is not being built
conf.gem :core => 'mruby-bin-mrbc'
conf.gem :core => 'mruby-bin-mruby'
conf.gem :core => 'mruby-bin-mirb'

Expand Down
10 changes: 6 additions & 4 deletions build_config/host-shared.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build mruby with a shared libmruby.so (in addition to the usual
# libmruby.a / executables).
#
# Produces (in build/host/lib/):
# Produces (in build/host-shared/lib/):
# libmruby.a the static archive (as in the default build)
# libmruby.so the shared library, with SONAME=libmruby.so.<MAJOR>.<MINOR>
# libmruby.so.<MAJOR>.<MINOR> symlink to libmruby.so (matches SONAME)
Expand All @@ -14,15 +14,17 @@
#
# The shared library is built FROM the static archive via
# `-Wl,--whole-archive`, so the existing static-build pipeline (including
# the test infrastructure) is unaffected. Executables in build/host/bin
# the test infrastructure) is unaffected. Executables in build/host-shared/bin
# remain statically linked; distros that want dynamically-linked
# executables can rebuild them against the .so.
#
# NOTE: gcc/clang only — VisualC++ support requires a separate config.

require "mruby/source"

MRuby::Build.new do |conf|
# Shared-library build in a dedicated build directory (build/host-shared) so
# it does not clobber a normal host build.
MRuby::Build.new('host-shared') do |conf|
conf.toolchain

# include the GEM box
Expand All @@ -42,7 +44,7 @@
# Add the shared-library targets as a post-build pass, so the default
# static-build pipeline remains untouched.
MRuby.each_target do
next unless name == "host"
next unless name == "host-shared"

libdir = File.join(build_dir, libdir_name)
vermap = File.join(build_dir, "libmruby.map")
Expand Down
Loading