make user_exts configurable in task block

Author: kateinoigakukun

Rakefile

@@ -56,8 +56,11 @@ namespace :build do
     end
     options = params
         .merge(BUILD_PROFILES[params[:profile]])
-        .merge(name: name, src: source, user_exts: user_exts, toolchain: toolchain)
+        .merge(name: name, src: source, toolchain: toolchain)
     options.delete :profile
-    RubyWasm::BuildTask.new(name, **options)
+    options.delete :user_exts
+    RubyWasm::BuildTask.new(name, **options) do |t|
+      t.crossruby.user_exts = user_exts
+    end
   end
 end

lib/ruby_wasm/build_system/build_params.rb

@@ -2,11 +2,9 @@ module RubyWasm
   BuildParams =
     Struct.new(
       :name,
-      :src,
       :target,
       :debug,
       :default_exts,
-      :user_exts,
       :wasmoptflags,
       keyword_init: true
     )

lib/ruby_wasm/build_system/product/crossruby.rb

@@ -62,15 +62,25 @@ def define_task(crossruby)
 
   class CrossRubyProduct < BuildProduct
     attr_reader :source, :toolchain, :build, :configure
-
-    def initialize(params, build_dir, rubies_dir, baseruby, source, toolchain)
+    attr_accessor :user_exts
+
+    def initialize(
+      params,
+      build_dir,
+      rubies_dir,
+      baseruby,
+      source,
+      toolchain,
+      user_exts: []
+    )
       @params = params
       @rubies_dir = rubies_dir
       @build_dir = build_dir
       @baseruby = baseruby
       @source = source
       @toolchain = toolchain
       @dep_tasks = []
+      @user_exts = user_exts
     end
 
     def define_task
@@ -92,12 +102,12 @@ def define_task
           sh "make rbconfig.rb", chdir: build_dir
         end
 
-      user_ext_products = @params.user_exts
-      user_ext_tasks = user_ext_products.map { |prod| prod.define_task(self) }
+      user_ext_products = @user_exts
+      user_ext_tasks = @user_exts.map { |prod| prod.define_task(self) }
       extinit_task =
         task extinit_obj => [@configure, extinit_c_erb] + user_ext_tasks do
           mkdir_p File.dirname(extinit_obj)
-          sh %Q(ruby #{extinit_c_erb} #{user_ext_products.map(&:name).join(" ")} | #{toolchain.cc} -c -x c - -o #{extinit_obj})
+          sh %Q(ruby #{extinit_c_erb} #{@user_exts.map(&:name).join(" ")} | #{toolchain.cc} -c -x c - -o #{extinit_obj})
         end
 
       install =
@@ -115,7 +125,7 @@ def define_task
         ruby_api_version =
           `#{baseruby_path} -e 'print RbConfig::CONFIG["ruby_version"]'`
         # TODO: move copying logic to ext product
-        user_ext_products.each do |ext|
+        @user_exts.each do |ext|
           ext_lib = File.join(ext.srcdir, "lib")
           next unless File.exist?(ext_lib)
           cp_r(
@@ -173,7 +183,6 @@ def dep_tasks
     def configure_args(build_triple, toolchain)
       target = @params.target
       default_exts = @params.default_exts
-      user_exts = @params.user_exts
 
       ldflags =
         if @params.debug
@@ -204,7 +213,7 @@ def configure_args(build_triple, toolchain)
         raise "unknown target: #{target}"
       end
 
-      (user_exts || []).each { |lib| xldflags << "@#{lib.linklist(self)}" }
+      (@user_exts || []).each { |lib| xldflags << "@#{lib.linklist(self)}" }
       xldflags << extinit_obj
 
       xcflags = []

lib/ruby_wasm/rake_task.rb

@@ -28,7 +28,6 @@ def initialize(
     name,
     target:,
     src:,
-    user_exts: [],
     toolchain: nil,
     build_dir: nil,
     rubies_dir: nil,
@@ -39,7 +38,6 @@ def initialize(
     @build_dir = build_dir || File.join(Dir.pwd, "build")
     @rubies_dir = rubies_dir || File.join(Dir.pwd, "rubies")
     @toolchain = toolchain || RubyWasm::Toolchain.get(target)
-    @user_exts = user_exts
 
     @libyaml =
       add_product RubyWasm::LibYAMLProduct.new(@build_dir, @target, @toolchain)
@@ -49,14 +47,7 @@ def initialize(
     @baseruby = add_product RubyWasm::BaseRubyProduct.new(@build_dir, @source)
 
     build_params =
-      RubyWasm::BuildParams.new(
-        options.merge(
-          name: name,
-          src: @source,
-          target: @target,
-          user_exts: @user_exts
-        )
-      )
+      RubyWasm::BuildParams.new(options.merge(name: name, target: @target))
 
     @crossruby =
       add_product RubyWasm::CrossRubyProduct.new(