Merge pull request #5230 from dearblue/mruby-config.2

Ignore `mruby-bin-config` in cross-building

2 files changed, 7 insertions, 2 deletions

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?
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'