admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5318 from shuujii/fix-breakage-where-builds-except-host-dont-refer-mrbc-in-host

Browse Source 
Fix breakage where builds except `host` don't refer` mrbc` in `host`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-02-04 15:24:05 +09:00
committed by GitHub
parent c43dd75ea9 f92c1f1b7f
commit 6f354322a8
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/mruby/build.rb
+9 -5
View File
@@ -320,12 +320,16 @@ EOS
return @mrbcfile if @mrbcfile
gem_name = "mruby-bin-mrbc"
gem = @gems[gem_name]
gem ||= (host = MRuby.targets["host"]) && host.gems[gem_name]
unless gem
fail "external mrbc or mruby-bin-mrbc gem in current('#{@name}') or 'host' build is required"
if (gem = @gems[gem_name])
@mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
elsif !host? && (host = MRuby.targets["host"])
if (gem = host.gems[gem_name])
@mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
elsif host.mrbcfile_external?
@mrbcfile = host.mrbcfile
end
end
@mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
@mrbcfile || fail("external mrbc or mruby-bin-mrbc gem in current('#{@name}') or 'host' build is required")
end
def mrbcfile=(path)