Skip to content

build: ask the build too whether a cross target compiles without floats #7238

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: ask the build too whether a cross target compiles without floats #7238

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
40 changes: 31 additions & 9 deletions lib/mruby/build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,16 @@ def mrbcfile
mrbcfile_external? ? super : MRuby::targets[@mrbc_host].mrbcfile
end

# The defines a target and the `mrbc` it borrows have to agree on.
#
# The bytecode `mrbc` emits has to be loadable on the target, 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. A define
# that decides what a pool entry may hold belongs in this list, which is
# where the comparison in `bind_mrbc_host` and the defines a build
# generated there carries both read the question from.
MRBC_DEFINES = %w[MRB_NO_FLOAT].freeze

def run_test
@test_runner.runner_options << verbose_flag
mrbtest = exefile("#{build_dir}/bin/mrbtest")
Expand Down Expand Up @@ -655,17 +665,14 @@ def create_mrbc_build; end

# 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
# A target can only borrow from a build that answers `MRBC_DEFINES` 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')
needed = mrbc_defines(self)
host = MRuby.targets['host']
return 'host' if host && host.cc.has_define?('MRB_NO_FLOAT') == no_float
return 'host' if host && mrbc_defines(host) == needed

# 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
Expand All @@ -676,9 +683,24 @@ def bind_mrbc_host
conf.toolchain
conf.build_mrbc_exec
conf.disable_libmruby
conf.compilers.each {|c| c.defines << 'MRB_NO_FLOAT'} if no_float
conf.compilers.each {|c| c.defines.concat(needed)}
end
name
end

# The answer `build` gives to every question in `MRBC_DEFINES`, as the
# defines it says yes to.
#
# Both lists a build config writes answer, the way `Build#has_define?`
# reads them, because `Command::Compiler#all_flags` puts `build.defines`
# on the same command line as a compiler's own. `Build#has_define?` itself
# cannot be asked here: it refuses until the gems are set up, and a cross
# build binds its `mrbc` as it is declared.
def mrbc_defines(build)
own = build.defines.flatten.map {|d| d.to_s.split('=', 2).first}
MRBC_DEFINES.select do |d|
own.include?(d) || build.compilers.any? {|c| c.has_define?(d)}
end
end
end # CrossBuild
end # MRuby
Loading