1 files changed, 12 insertions, 10 deletions
@@ -11,13 +11,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 FileEntry = FileUtils::Entry_ # :nodoc:
 def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
- tmp_dest = Dir.mktmpdir(".gem.", ".")
 t = nil
 Tempfile.open %w"siteconf .rb", "." do |siteconf|
 t = siteconf
 siteconf.puts "require 'rbconfig'"
- siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
 %w[sitearchdir sitelibdir].each do |dir|
 siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
 siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
@@ -25,14 +27,10 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 siteconf.flush
- siteconf_path = File.expand_path siteconf.path
-
- rubyopt = ENV["RUBYOPT"]
 destdir = ENV["DESTDIR"]
 begin
- ENV["RUBYOPT"] = ["-r#{siteconf_path}", rubyopt].compact.join(' ')
- cmd = [Gem.ruby, File.basename(extension), *args].join ' '
 begin
 run cmd, results
@@ -42,7 +40,6 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 end
 ENV["DESTDIR"] = nil
- ENV["RUBYOPT"] = rubyopt
 make dest_path, results
@@ -57,11 +54,10 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 FileEntry.new(tmp_dest).traverse do |ent|
 destent = ent.class.new(dest_path, ent.rel)
- destent.exist? or File.rename(ent.path, destent.path)
 end
 end
 ensure
- ENV["RUBYOPT"] = rubyopt
 ENV["DESTDIR"] = destdir
 end
 end
@@ -72,5 +68,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 FileUtils.rm_rf tmp_dest if tmp_dest
 end
 end