From 73b4152574f0dd6747488662751f59f8c4c0b50d Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Sat, 5 Dec 2020 09:16:08 +0900
Subject: Make it possible that `libmruby.a` is not created

Previously, `libmruby.a` was created even if only `mruby-bin-mrbc` or`
mruby-compiler` was specified for gem, but by specifying `disable_libmruby`,
the creation of `libmruby.a` can be suppressed.

### Note

The https://github.com/mruby/mruby/pull/5084#issuecomment-723521971
incompatibility seems to be difficult for users to avoid, so the original
behavior has been restored. Therefore, if we need `mrbc` other than the
`host` build, we need to explicitly specify `mruby-bin-mrbc` gem.

Due to the above changes, `build_config/boxing.rb` etc. will not work, but I
have added` mruby-bin-mrbc` to `default.gembox` to fix it. I don't think
this change is a big deal because originally `mruby-compiler` was included.
---
 Rakefile                           |  2 +-
 build_config/no-float.rb           |  6 ------
 lib/mruby/build.rb                 | 33 ++++++++++++++++++++-------------
 lib/mruby/gem.rb                   |  4 ++++
 mrbgems/default.gembox             |  3 +++
 mrbgems/mruby-bin-mrbc/mrbgem.rake |  7 +++----
 mrbgems/mruby-compiler/mrbgem.rake | 27 +++++++++++----------------
 tasks/core.rake                    |  6 +-----
 tasks/libmruby.rake                |  6 ++++++
 tasks/mrblib.rake                  |  2 ++
 10 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/Rakefile b/Rakefile
index c2c76ba1b..e54983f41 100644
--- a/Rakefile
+++ b/Rakefile
@@ -230,7 +230,7 @@ desc "preallocated symbols"
 task :gensym => presym_file
 
 depfiles += MRuby.targets.map { |n, t|
-  t.libraries
+  t.libmruby_enabled? ? t.libraries : t.libmruby_core_static
 }.flatten
 
 depfiles += MRuby.targets.reject { |n, t| n == 'host' }.map { |n, t|
diff --git a/build_config/no-float.rb b/build_config/no-float.rb
index 57cca1688..1138188e3 100644
--- a/build_config/no-float.rb
+++ b/build_config/no-float.rb
@@ -1,9 +1,3 @@
-MRuby::Build.new("host") do |conf|
-  # load specific toolchain settings
-  toolchain :gcc
-  conf.gem :core => "mruby-bin-mrbc"
-end
-
 # Define cross build settings
 MRuby::CrossBuild.new('no-float') do |conf|
   toolchain :gcc
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index a9e84effe..c4ed79fb1 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -53,7 +53,7 @@ module MRuby
     include Rake::DSL
     include LoadGems
     attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir
-    attr_reader :libmruby_objs, :gems, :toolchains, :gem_dir_to_repo_url
+    attr_reader :libmruby_core_objs, :libmruby_objs, :gems, :toolchains, :gem_dir_to_repo_url
 
     alias libmruby libmruby_objs
 
@@ -66,7 +66,7 @@ module MRuby
     def initialize(name='host', build_dir=nil, &block)
       @name = name.to_s
 
-      unless MRuby.targets[@name]
+      unless current = MRuby.targets[@name]
         if ENV['OS'] == 'Windows_NT'
           @exts = Exts.new('.o', '.exe', '.a')
         else
@@ -91,7 +91,9 @@ module MRuby
 
         @bins = []
         @gems = MRuby::Gem::List.new
-        @libmruby_objs = []
+        @libmruby_core_objs = []
+        @libmruby_objs = [@libmruby_core_objs]
+        @enable_libmruby = true
         @build_mrbtest_lib_only = false
         @cxx_exception_enabled = false
         @cxx_exception_disabled = false
@@ -102,15 +104,22 @@ module MRuby
         @toolchains = []
         @gem_dir_to_repo_url = {}
 
-        MRuby.targets[@name] = self
+        MRuby.targets[@name] = self.class.current = current = self
       end
 
-      current = MRuby.targets[@name]
-      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?
     end
 
+    def libmruby_enabled?
+      @enable_libmruby
+    end
+
+    def disable_libmruby
+      @enable_libmruby = false
+    end
+
     def debug_enabled?
       @enable_debug
     end
@@ -255,11 +264,9 @@ EOS
     def mrbcfile
       return @mrbcfile if @mrbcfile
 
-      unless gems.detect {|v| v.name == 'mruby-bin-mrbc' }
-        build_mrbc_exec
-        gems.detect {|v| v.name == 'mruby-bin-mrbc' }.setup
-      end
-      @mrbcfile = self.exefile("#{self.build_dir}/bin/mrbc")
+      gem_name = "mruby-bin-mrbc"
+      gem = gems[gem_name] || MRuby.targets["host"].gems[gem_name]
+      @mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
     end
 
     def compilers
@@ -392,6 +399,7 @@ EOS
             toolchain :gcc
           end
           conf.gem :core => 'mruby-bin-mrbc'
+          conf.disable_libmruby
         end
       end
       @endian = nil
@@ -400,8 +408,7 @@ EOS
     end
 
     def mrbcfile
-      host = MRuby.targets['host']
-      host.exefile("#{host.build_dir}/bin/mrbc")
+      MRuby.targets['host'].mrbcfile
     end
 
     def run_test
diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb
index eb94c9eda..e3b758f4f 100644
--- a/lib/mruby/gem.rb
+++ b/lib/mruby/gem.rb
@@ -353,6 +353,10 @@ module MRuby
         @ary.each(&b)
       end
 
+      def [](name)
+        @ary.detect {|g| g.name == name}
+      end
+
       def <<(gem)
         unless @ary.detect {|g| g.dir == gem.dir }
           @ary << gem
diff --git a/mrbgems/default.gembox b/mrbgems/default.gembox
index de169906b..ca8938e87 100644
--- a/mrbgems/default.gembox
+++ b/mrbgems/default.gembox
@@ -78,6 +78,9 @@ MRuby::GemBox.new do |conf|
   conf.gem :core => "mruby-rational"
   conf.gem :core => "mruby-complex"
 
+  # Generate mrbc command
+  conf.gem :core => "mruby-bin-mrbc"
+
   # Generate mirb command
   conf.gem :core => "mruby-bin-mirb"
 
diff --git a/mrbgems/mruby-bin-mrbc/mrbgem.rake b/mrbgems/mruby-bin-mrbc/mrbgem.rake
index 48b67aedb..67200b3f0 100644
--- a/mrbgems/mruby-bin-mrbc/mrbgem.rake
+++ b/mrbgems/mruby-bin-mrbc/mrbgem.rake
@@ -2,15 +2,14 @@ MRuby::Gem::Specification.new 'mruby-bin-mrbc' do |spec|
   spec.license = 'MIT'
   spec.author  = 'mruby developers'
   spec.summary = 'mruby compiler executable'
-
   spec.add_dependency 'mruby-compiler', :core => 'mruby-compiler'
 
   exec = exefile("#{build.build_dir}/bin/mrbc")
-  mrbc_objs = Dir.glob("#{spec.dir}/tools/mrbc/*.c").map { |f| objfile(f.pathmap("#{spec.build_dir}/tools/mrbc/%n")) }.flatten
+  mrbc_objs = Dir.glob("#{spec.dir}/tools/mrbc/*.c").map { |f| objfile(f.pathmap("#{spec.build_dir}/tools/mrbc/%n")) }
 
-  file exec => mrbc_objs + [build.libmruby_core_static] do |t|
+  file exec => mrbc_objs << build.libmruby_core_static do |t|
     build.linker.run t.name, t.prerequisites
   end
 
-  build.bins << 'mrbc' unless build.bins.find { |v| v == 'mrbc' }
+  build.bins << 'mrbc'
 end
diff --git a/mrbgems/mruby-compiler/mrbgem.rake b/mrbgems/mruby-compiler/mrbgem.rake
index 9df846abb..70f9e19d8 100644
--- a/mrbgems/mruby-compiler/mrbgem.rake
+++ b/mrbgems/mruby-compiler/mrbgem.rake
@@ -3,20 +3,18 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec|
   spec.author  = 'mruby developers'
   spec.summary = 'mruby compiler library'
 
-  lex_def = "#{dir}/core/lex.def"
-  core_objs = Dir.glob("#{dir}/core/*.c").map { |f|
-    next nil if build.cxx_exception_enabled? and f =~ /(codegen|y\.tab)\.c$/
-    objfile(f.pathmap("#{build_dir}/core/%n"))
-  }.compact
-
-  if build.cxx_exception_enabled?
-    core_objs <<
-      build.compile_as_cxx("#{dir}/core/y.tab.c", "#{build_dir}/core/y.tab.cxx",
-                           objfile("#{build_dir}/y.tab"), ["#{dir}/core"]) <<
-      build.compile_as_cxx("#{dir}/core/codegen.c", "#{build_dir}/core/codegen.cxx")
-  else
-    core_objs << objfile("#{build_dir}/core/y.tab")
+  as_cxx_srcs = %w[codegen y.tab].map{|name| "#{dir}/core/#{name}.c"}
+  objs = Dir.glob("#{dir}/core/*.c").map do |src|
+    dst = src.pathmap("#{build_dir}/core/%n")
+    if build.cxx_exception_enabled? && as_cxx_srcs.include?(src)
+      build.compile_as_cxx(src, "#{dst}.cxx")
+    else
+      objfile(dst)
+    end
   end
+  build.libmruby_core_objs << objs
+
+  lex_def = "#{dir}/core/lex.def"
 
   # Parser
   file "#{dir}/core/y.tab.c" => ["#{dir}/core/parse.y", lex_def] do |t|
@@ -30,9 +28,6 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec|
     replace_line_directive(t.name)
   end
 
-  file build.libmruby_core_static => core_objs
-  build.libmruby << core_objs
-
   def replace_line_directive(path)
     content = File.read(path).gsub(%r{
       ^\#line\s+\d+\s+"\K.*$ |                  # #line directive
diff --git a/tasks/core.rake b/tasks/core.rake
index c4816d4ce..aca5faed8 100644
--- a/tasks/core.rake
+++ b/tasks/core.rake
@@ -9,9 +9,5 @@ MRuby.each_target do
       objfile(dst)
     end
   end
-  self.libmruby_objs << objs
-
-  file libmruby_core_static => objs do |t|
-    archiver.run t.name, t.prerequisites
-  end
+  self.libmruby_core_objs << objs
 end
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake
index e302ca02b..c73b25d3b 100644
--- a/tasks/libmruby.rake
+++ b/tasks/libmruby.rake
@@ -1,4 +1,10 @@
 MRuby.each_target do
+  file libmruby_core_static => libmruby_core_objs.flatten do |t|
+    archiver.run t.name, t.prerequisites
+  end
+
+  next unless libmruby_enabled?
+
   file libmruby_static => libmruby_objs.flatten do |t|
     archiver.run t.name, t.prerequisites
   end
diff --git a/tasks/mrblib.rake b/tasks/mrblib.rake
index 7231b63bc..a7f592593 100644
--- a/tasks/mrblib.rake
+++ b/tasks/mrblib.rake
@@ -1,4 +1,6 @@
 MRuby.each_target do
+  next unless libmruby_enabled?
+
   src = "#{build_dir}/mrblib/mrblib.c"
   obj = objfile(src.ext)
   rbfiles = Dir["#{MRUBY_ROOT}/mrblib/*.rb"].sort!
-- 
cgit v1.2.3