From db1b78820dab190f46643ce25d5d1a6d4c2e9f5e Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.osdn.me>
Date: Sat, 19 Dec 2020 15:44:29 +0900
Subject: Avoid using `MRuby::CrossBuild.current`

This is because `MRuby::Build.currrent` and `MRuby::CrossBuild.current` are assignments to different instance variables.
---
 lib/mruby/build.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index 83722a0e8..8fe1da2de 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -116,9 +116,10 @@ module MRuby
         @toolchains = []
         @gem_dir_to_repo_url = {}
 
-        MRuby.targets[@name] = self.class.current = current = self
+        MRuby.targets[@name] = current = self
       end
 
+      MRuby::Build.current = current
       current.instance_eval(&block)
       current.build_mrbc_exec if current.libmruby_enabled? && @name == "host"
       current.build_mrbtest if current.test_enabled?
-- 
cgit v1.2.3


From 36376eba5fe40bf6715ae9b0c04e4e34b84ab212 Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.osdn.me>
Date: Sat, 19 Dec 2020 15:50:08 +0900
Subject: Warn that it was ignored in crossbuild

---
 mrbgems/mruby-bin-config/mrbgem.rake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mrbgems/mruby-bin-config/mrbgem.rake b/mrbgems/mruby-bin-config/mrbgem.rake
index c56af435f..57096c8c9 100644
--- a/mrbgems/mruby-bin-config/mrbgem.rake
+++ b/mrbgems/mruby-bin-config/mrbgem.rake
@@ -1,4 +1,8 @@
-unless MRuby::Build.current.kind_of?(MRuby::CrossBuild)
+if MRuby::Build.current.kind_of?(MRuby::CrossBuild)
+  gemname = File.basename File.dirname __FILE__
+  buildname = MRuby::Build.current.name
+  $stderr.puts "WARN  #{gemname} - This mrbgem is ignored within #{buildname}"
+else
   MRuby::Gem::Specification.new('mruby-bin-config') do |spec|
     name = 'mruby-config'
     spec.license = 'MIT'
-- 
cgit v1.2.3