Skip to content

Commit 0cd8705

Browse files
committed
build(crossruby): always pass host dump_ast
Always pass --with-dump-ast alongside --with-baseruby during cross builds, and remove source capability detection. Keep the configure-args test focused on the unconditional dump_ast wiring.
1 parent 0fcea61 commit 0cd8705

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

lib/ruby_wasm/build/product/crossruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def configure_args(build_triple, toolchain)
340340
args << %Q(--with-zlib-dir=#{@zlib.install_root})
341341
args << %Q(--with-openssl-dir=#{@openssl.install_root}) if @openssl
342342
args << %Q(--with-baseruby=#{baseruby_path})
343-
args << %Q(--with-dump-ast=#{dump_ast_path}) if @source.supports_with_dump_ast?
343+
args << %Q(--with-dump-ast=#{dump_ast_path})
344344

345345
case target
346346
when /^wasm32-unknown-wasi/

lib/ruby_wasm/build/product/ruby_source.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ def configure_file
3333
File.join(src_dir, "configure")
3434
end
3535

36-
def supports_with_dump_ast?
37-
[File.join(src_dir, "configure.ac"), configure_file].any? do |path|
38-
File.file?(path) && File.read(path).include?("--with-dump-ast")
39-
end
40-
end
41-
4236
def fetch(executor)
4337
case @params[:type]
4438
when "github"

test/test_crossruby_configure_args.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_configure_args_include_dump_ast_when_supported
8080
end
8181
end
8282

83-
def test_configure_args_skip_dump_ast_when_unsupported
83+
def test_configure_args_include_dump_ast_even_when_configure_ac_does_not_mention_it
8484
Dir.mktmpdir do |tmpdir|
8585
crossruby =
8686
build_crossruby(
@@ -90,7 +90,7 @@ def test_configure_args_skip_dump_ast_when_unsupported
9090

9191
args = crossruby.configure_args("x86_64-linux-gnu", @toolchain)
9292

93-
assert_not_include args.grep(/\A--with-dump-ast=/), "--with-dump-ast=/tmp/baseruby/build/dump_ast"
93+
assert_include args, "--with-dump-ast=/tmp/baseruby/build/dump_ast"
9494
end
9595
end
9696
end

0 commit comments

Comments
 (0)