Skip to content

Commit 355751d

Browse files
committed
jt cextc no longer support clang-args
1 parent 2242f79 commit 355751d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tool/jt.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ def help
785785
jt gem shortcut for `jt ruby -S gem`, to install Ruby gems, etc
786786
jt e 14 + 2 evaluate an expression
787787
jt puts 14 + 2 evaluate and print an expression
788-
jt cextc directory clang-args compile the C extension in directory, with optional extra clang arguments
788+
jt cextc directory compile the C extension in directory
789789
jt test run all mri tests, specs and integration tests
790790
jt test basictest run MRI's basictest suite
791791
jt test bootstraptest run MRI's bootstraptest suite
@@ -1074,16 +1074,16 @@ def gem(*args)
10741074
ruby '-S', 'gem', *args
10751075
end
10761076

1077-
def cextc(cext_dir, *clang_opts)
1077+
def cextc(cext_dir)
10781078
require_ruby_launcher!
10791079
cext_dir = File.expand_path(cext_dir)
10801080
name = File.basename(cext_dir)
10811081
ext_dir = "#{cext_dir}/ext/#{name}"
10821082
target = "#{cext_dir}/lib/#{name}/#{name}.#{DLEXT}"
1083-
compile_cext(name, ext_dir, target, clang_opts)
1083+
compile_cext(name, ext_dir, target)
10841084
end
10851085

1086-
private def compile_cext(name, ext_dir, target, clang_opts, env: {})
1086+
private def compile_cext(name, ext_dir, target, env: {})
10871087
extconf = "#{ext_dir}/extconf.rb"
10881088
raise "#{extconf} does not exist" unless File.exist?(extconf)
10891089

@@ -1267,7 +1267,7 @@ def test(*args)
12671267
end
12681268
dest_dir = File.join(MRI_TEST_CEXT_LIB_DIR, target_dir)
12691269
FileUtils::Verbose.mkdir_p(dest_dir)
1270-
compile_cext(name, compile_dir, dest_dir, [], env: compile_env)
1270+
compile_cext(name, compile_dir, dest_dir, env: compile_env)
12711271
else
12721272
puts "c require not found for cext test: #{test_path}"
12731273
end
@@ -1399,7 +1399,7 @@ def retag(*args)
13991399
gem_root = "#{TRUFFLERUBY_DIR}/test/truffle/cexts/#{gem_name}"
14001400
ext_dir = Dir.glob("#{gem_home}/gems/#{gem_name}*/")[0] + "ext/#{gem_name}"
14011401

1402-
compile_cext gem_name, ext_dir, "#{gem_root}/lib/#{gem_name}/#{gem_name}.#{DLEXT}", ['-Werror=implicit-function-declaration']
1402+
compile_cext gem_name, ext_dir, "#{gem_root}/lib/#{gem_name}/#{gem_name}.#{DLEXT}"
14031403

14041404
next if gem_name == 'psd_native' # psd_native is excluded just for running
14051405
run_ruby(*dependencies.map { |d| "-I#{gem_home}/gems/#{d}/lib" },

0 commit comments

Comments
 (0)