aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/ext/ext_conf_builder.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-04-29 09:07:16 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-07-31 07:47:00 +0800
commitd64cc80b660c30577945f3cac452ca16db44ce9f (patch)
treeef0775362501e852e0c651b5a8471a15fc6d0206 /lib/rubygems/ext/ext_conf_builder.rb
parent4e27319c2c0a58ed5ee7276f5f69946161fb6367 (diff)
downloadruby-d64cc80b660c30577945f3cac452ca16db44ce9f.tar.gz
[rubygems/rubygems] Migrate extension builder to use Open3
Since it works on jruby. https://github.com/rubygems/rubygems/commit/5229e00df4
Diffstat (limited to 'lib/rubygems/ext/ext_conf_builder.rb')
-rw-r--r--lib/rubygems/ext/ext_conf_builder.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 169da438ba..9068f9a5df 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -45,15 +45,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
cmd.push(*args)
begin
- run cmd, results
- ensure
- if File.exist? 'mkmf.log'
- unless $?.success?
- results << "To see why this extension failed to compile, please check" \
- " the mkmf.log which can be found here:\n"
- results << " " + File.join(dest_path, 'mkmf.log') + "\n"
+ run(cmd, results) do |status, results|
+ if File.exist? 'mkmf.log'
+ unless status.success?
+ results << "To see why this extension failed to compile, please check" \
+ " the mkmf.log which can be found here:\n"
+ results << " " + File.join(dest_path, 'mkmf.log') + "\n"
+ end
+ FileUtils.mv 'mkmf.log', dest_path
end
- FileUtils.mv 'mkmf.log', dest_path
end
siteconf.unlink
end