Build exts under unbundled environment for dynamic linking too

Author: kateinoigakukun

lib/ruby_wasm/packager/core.rb

@@ -67,6 +67,14 @@ def wasi_exec_model
       use_js_gem ? "reactor" : "command"
     end
 
+    def with_unbundled_env(&block)
+      __skip__ = if defined?(Bundler)
+        Bundler.with_unbundled_env(&block)
+      else
+        block.call
+      end
+    end
+
     def cache_key(digest)
       raise NotImplementedError
     end
@@ -87,27 +95,22 @@ def build(executor, options)
       end
       build.crossruby.clean(executor) if options[:clean]
 
-      do_build =
-        proc do
-          build.crossruby.build(
-            executor,
-            remake: options[:remake],
-            reconfigure: options[:reconfigure]
-          )
-        end
+      self.with_unbundled_env do
+        build.crossruby.build(
+          executor,
+          remake: options[:remake],
+          reconfigure: options[:reconfigure]
+        )
+      end
 
-      __skip__ =
-        if defined?(Bundler)
-          Bundler.with_unbundled_env(&do_build)
-        else
-          do_build.call
-        end
       build.crossruby.artifact
     end
 
     def build_gem_exts(executor, gem_home)
       build = derive_build
-      self._build_gem_exts(executor, build, gem_home)
+      self.with_unbundled_env do
+        self._build_gem_exts(executor, build, gem_home)
+      end
     end
 
     def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
@@ -269,21 +272,14 @@ def build(executor, options)
       end
       build.crossruby.clean(executor) if options[:clean]
 
-      do_build =
-        proc do
-          build.crossruby.build(
-            executor,
-            remake: options[:remake],
-            reconfigure: options[:reconfigure]
-          )
-        end
+      self.with_unbundled_env do
+        build.crossruby.build(
+          executor,
+          remake: options[:remake],
+          reconfigure: options[:reconfigure]
+        )
+      end
 
-      __skip__ =
-        if defined?(Bundler)
-          Bundler.with_unbundled_env(&do_build)
-        else
-          do_build.call
-        end
       build.crossruby.artifact
     end
 

sig/ruby_wasm/packager.rbs

@@ -77,6 +77,7 @@ class RubyWasm::Packager
       def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
       def link_gem_exts: (RubyWasm::BuildExecutor, string ruby_root, string gem_home, bytes module_bytes) -> bytes
       def wasi_exec_model: () -> String
+      def with_unbundled_env: () { () -> void } -> void
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy