archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 39559: [Backport #7991]

Browse source 
* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
	  use RUBYOPT instead of -r option, and revert some tests.  [Bug #7698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-17 14:20:55 +00:00
parent 5d6aa9ba8b
commit bbe8000821
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/rubygems/ext/ext_conf_builder.rb
View file

@ -22,7 +22,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
f
end
cmd = [Gem.ruby, "-r#{siteconf.path}", File.basename(extension), *args].join ' '
rubyopt = ENV["RUBYOPT"]
ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
cmd = [Gem.ruby, File.basename(extension), *args].join ' '
run cmd, results
@ -30,6 +32,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
results
ensure
ENV["RUBYOPT"] = rubyopt
siteconf.close(true) if siteconf
end