Skip to content

build: give a cross build's mrbc the target's answer on floats #7230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matz merged 1 commit into from
Aug 17, 2026
Merged

build: give a cross build's mrbc the target's answer on floats #7230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 32 additions & 9 deletions lib/mruby/build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,18 +615,11 @@ class CrossBuild < Build
def initialize(name, build_dir=nil, &block)
@test_runner = Command::CrossTestRunner.new(self)
super
unless mrbcfile_external? || MRuby.targets['host']
# add minimal 'host'
MRuby::Build.new('host') do |conf|
conf.toolchain
conf.build_mrbc_exec
conf.disable_libmruby
end
end
@mrbc_host = mrbcfile_external? ? nil : bind_mrbc_host
end

def mrbcfile
mrbcfile_external? ? super : MRuby::targets['host'].mrbcfile
mrbcfile_external? ? super : MRuby::targets[@mrbc_host].mrbcfile
end

def run_test
Expand Down Expand Up @@ -657,5 +650,35 @@ def run_bintest
protected

def create_mrbc_build; end

private

# Name the build this target borrows `mrbc` from.
#
# The bytecode `mrbc` emits has to be loadable here, and `src/load.c`
# refuses a whole irep over a single pool entry the target cannot
# represent: under `MRB_NO_FLOAT` a float literal is one. So a target can
# only borrow from a build that answers the float question the way it
# does, and where none is at hand it gets one that does. A `host` the
# build config declares itself is left as it is written; the build
# generated here is this code's own and carries the target's answer.
def bind_mrbc_host
no_float = cc.has_define?('MRB_NO_FLOAT')
host = MRuby.targets['host']
return 'host' if host && host.cc.has_define?('MRB_NO_FLOAT') == no_float

# Where there is no `host` the generated build takes that name, as it
# always has. Where there is one and it answers otherwise, the build
# config owns the name, so this target gets a private `mrbc` beside its
# own output instead, the way a native build gets one.
name, internal = host ? ["#{@name}/mrbc", true] : ['host', false]
MRuby::Build.new(name, internal: internal) do |conf|
conf.toolchain
conf.build_mrbc_exec
conf.disable_libmruby
conf.compilers.each {|c| c.defines << 'MRB_NO_FLOAT'} if no_float
end
Comment thread
coderabbitai[bot] marked this conversation as resolved.
name
end
end # CrossBuild
end # MRuby
Loading