@@ -13,9 +13,9 @@ module RubyWasm
1313
1414 class AutoconfProduct < BuildProduct
1515 @target: String
16- @toolchain: Emscripten | WASISDK
16+ @toolchain: Toolchain
1717
18- def initialize : (String target, Emscripten | WASISDK toolchain) -> void
18+ def initialize : (String target, Toolchain toolchain) -> void
1919 def system_triplet_args : -> Array[String]
2020 | -> Array[String]
2121 def tools_args : -> Array[String]
@@ -54,7 +54,7 @@ module RubyWasm
5454 @build_dir: String
5555
5656 attr_reader target: String
57- def initialize : (String build_dir, String target, Emscripten | WASISDK toolchain) -> void
57+ def initialize : (String build_dir, String target, Toolchain toolchain) -> void
5858 def product_build_dir : -> String
5959 def destdir : -> String
6060 def install_root : -> String
@@ -68,7 +68,7 @@ module RubyWasm
6868 @build_dir: String
6969
7070 attr_reader target: String
71- def initialize : (String build_dir, String target, Emscripten | WASISDK toolchain) -> void
71+ def initialize : (String build_dir, String target, Toolchain toolchain) -> void
7272 def product_build_dir : -> String
7373 def destdir : -> String
7474 def install_root : -> String
@@ -81,7 +81,7 @@ module RubyWasm
8181 @build_dir: String
8282
8383 attr_reader target: String
84- def initialize : (String build_dir, String target, Emscripten | WASISDK toolchain) -> void
84+ def initialize : (String build_dir, String target, Toolchain toolchain) -> void
8585 def product_build_dir : -> String
8686 def destdir : -> String
8787 def install_root : -> String
@@ -134,7 +134,7 @@ module RubyWasm
134134 @wasi_vfs: WasiVfsProduct
135135
136136 attr_reader source: BuildSource
137- attr_reader toolchain: Emscripten | WASISDK
137+ attr_reader toolchain: Toolchain
138138 attr_accessor user_exts: Array[CrossRubyExtProduct]
139139 attr_accessor wasmoptflags: Array[String]
140140 attr_accessor cppflags: Array[String]
@@ -143,7 +143,7 @@ module RubyWasm
143143 attr_accessor debugflags: Array[String]
144144 attr_accessor xcflags: Array[String]
145145 attr_accessor xldflags: Array[String]
146- def initialize : (BuildParams params, String build_dir, String rubies_dir, BaseRubyProduct baseruby, BuildSource source, Emscripten | WASISDK toolchain, ?user_exts: Array[CrossRubyExtProduct]) -> void
146+ def initialize : (BuildParams params, String build_dir, String rubies_dir, BaseRubyProduct baseruby, BuildSource source, Toolchain toolchain, ?user_exts: Array[CrossRubyExtProduct]) -> void
147147 def configure : (BuildExecutor executor, ?reconfigure: bool ) -> void
148148 def build_exts : (BuildExecutor executor) -> bool ?
149149 def build : (BuildExecutor executor, ?remake: bool , ?reconfigure: bool ) -> bool ?
@@ -161,7 +161,7 @@ module RubyWasm
161161 def extinit_obj : -> String
162162 def extinit_c_erb : -> String
163163 def baseruby_path : -> String
164- def configure_args : (String build_triple, Emscripten | WASISDK toolchain) -> Array[String]
164+ def configure_args : (String build_triple, Toolchain toolchain) -> Array[String]
165165 end
166166
167167 class WitBindgen
@@ -182,13 +182,15 @@ module RubyWasm
182182 def initialize : -> void
183183 def find_tool : (Symbol name) -> bot
184184 def check_envvar : (untyped name) -> nil
185- def self.get : (String target, ?String? build_dir) -> (Emscripten | WASISDK )
185+ def self.get : (String target, ?String? build_dir) -> (Toolchain )
186186 def self.find_path : (String command) -> String?
187187 def self.check_executable : (String command) -> String
188188 def cc : -> nil
189189 def ranlib : -> nil
190190 def ld : -> nil
191191 def ar : -> nil
192+
193+ def install : -> void
192194 end
193195
194196 class WASISDK < Toolchain
@@ -210,14 +212,12 @@ module RubyWasm
210212 def binaryen_download_url : (Integer? version) -> String
211213 def install_wasi_sdk : -> void
212214 def install_binaryen : -> void
213- def install : -> void
214215 end
215216
216217 class Emscripten < Toolchain
217218 @tools: Hash[Symbol, String]
218219
219220 def initialize : -> void
220- def install : -> nil
221221 def find_tool : (Symbol name) -> String
222222 end
223223
@@ -245,7 +245,7 @@ module RubyWasm
245245 attr_accessor name: String
246246 attr_reader source: BuildSource
247247 attr_reader target: String
248- attr_reader toolchain: Emscripten | WASISDK
248+ attr_reader toolchain: Toolchain
249249 attr_reader libyaml: LibYAMLProduct
250250 attr_reader zlib: ZlibProduct
251251 attr_reader wasi_vfs: WasiVfsProduct
0 commit comments