build: Add Target class to represent a build destination

Author: kateinoigakukun

lib/ruby_wasm/build.rb

@@ -2,6 +2,7 @@
 require_relative "build/product"
 require_relative "build/toolchain"
 require_relative "build/executor"
+require_relative "build/target"
 
 class RubyWasm::Build
   # Source to build from.
@@ -79,7 +80,7 @@ def cache_key(digest)
     @crossruby.cache_key(digest)
     digest << @build_dir
     digest << @rubies_dir
-    digest << @target
+    @target.cache_key(digest)
     digest << @toolchain.name
     digest << @libyaml.name
     digest << @zlib.name

lib/ruby_wasm/build/product/crossruby.rb

@@ -221,7 +221,7 @@ def name
     end
 
     def cache_key(digest)
-      digest << @params.target
+      @params.target.cache_key(digest)
       digest << @params.default_exts
       @wasmoptflags.each { |f| digest << f }
       @cppflags.each { |f| digest << f }
@@ -234,11 +234,11 @@ def cache_key(digest)
     end
 
     def build_dir
-      File.join(@build_dir, @params.target, name)
+      File.join(@build_dir, @params.target.to_s, name)
     end
 
     def ext_build_dir
-      File.join(@build_dir, @params.target, name + "-ext")
+      File.join(@build_dir, @params.target.to_s, name + "-ext")
     end
 
     def with_libyaml(libyaml)
@@ -279,7 +279,7 @@ def baseruby_path
     end
 
     def configure_args(build_triple, toolchain)
-      target = @params.target
+      target = @params.target.triple
       default_exts = @params.default_exts
 
       ldflags = @ldflags.dup

lib/ruby_wasm/build/product/libyaml.rb

@@ -13,7 +13,7 @@ def initialize(build_dir, target, toolchain)
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "yaml-#{LIBYAML_VERSION}")
+      File.join(@build_dir, target.to_s, "yaml-#{LIBYAML_VERSION}")
     end
 
     def destdir

lib/ruby_wasm/build/product/openssl.rb

@@ -13,7 +13,7 @@ def initialize(build_dir, target, toolchain)
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "openssl-#{OPENSSL_VERSION}")
+      File.join(@build_dir, target.to_s, "openssl-#{OPENSSL_VERSION}")
     end
 
     def destdir
@@ -42,7 +42,7 @@ def configure_args
         --libdir=lib
         -Wl,--allow-undefined
       ]
-      if @target == "wasm32-unknown-wasi"
+      if @target.triple == "wasm32-unknown-wasi"
         args.concat %w[
                       -D_WASI_EMULATED_SIGNAL
                       -D_WASI_EMULATED_PROCESS_CLOCKS

lib/ruby_wasm/build/product/product.rb

@@ -12,13 +12,13 @@ def initialize(target, toolchain)
     end
     def system_triplet_args
       args = []
-      case @target
+      case @target.triple
       when "wasm32-unknown-wasi"
         args.concat(%W[--host wasm32-wasi])
       when "wasm32-unknown-emscripten"
         args.concat(%W[--host wasm32-emscripten])
       else
-        raise "unknown target: #{@target}"
+        raise "unknown target: #{@target.triple}"
       end
       args
     end

lib/ruby_wasm/build/product/zlib.rb

@@ -13,7 +13,7 @@ def initialize(build_dir, target, toolchain)
     end
 
     def product_build_dir
-      File.join(@build_dir, target, "zlib-#{ZLIB_VERSION}")
+      File.join(@build_dir, target.to_s, "zlib-#{ZLIB_VERSION}")
     end
 
     def destdir

lib/ruby_wasm/build/target.rb

@@ -0,0 +1,24 @@
+module RubyWasm
+  # A build target representation
+  class Target
+    attr_reader :triple
+
+    def initialize(triple, pic: false)
+      @triple = triple
+      @pic = pic
+    end
+
+    def pic?
+      @pic
+    end
+
+    def to_s
+      "#{@triple}#{@pic ? "-pic" : ""}"
+    end
+
+    def cache_key(digest)
+      digest << @triple
+      digest << "pic" if @pic
+    end
+  end
+end

lib/ruby_wasm/packager.rb

@@ -72,7 +72,7 @@ def support_dynamic_linking?
   # Retrieves the build options used for building Ruby itself.
   def build_options
     default = {
-      target: "wasm32-unknown-wasi",
+      target: RubyWasm::Target.new("wasm32-unknown-wasi"),
       default_exts: ALL_DEFAULT_EXTS
     }
     override = @config || {}

lib/ruby_wasm/packager/core.rb

@@ -99,10 +99,14 @@ def artifact
       derive_build.crossruby.artifact
     end
 
+    def target
+      RubyWasm::Target.new(@packager.full_build_options[:target], pic: true)
+    end
+
     def derive_build
       return @build if @build
       __skip__ =
-        build ||= RubyWasm::Build.new(name, **@packager.full_build_options)
+        build ||= RubyWasm::Build.new(name, **@packager.full_build_options, target: target)
       build.crossruby.user_exts = user_exts(build)
       # Emscripten uses --global-base=1024 by default, but it conflicts with
       # --stack-first and -z stack-size since global-base 1024 is smaller than

lib/ruby_wasm/rake_task.rb

@@ -16,6 +16,7 @@ def initialize(
     **options,
     &block
   )
+    target = Target.new(target)
     @build =
       RubyWasm::Build.new(
         name,