1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext_conf_builder.rb: clear DESTDIR

Browse Source 
* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
  clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
  [Bug #7698]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-05 01:06:08 +00:00
parent 001e06ed36
commit 66867b0a63
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rubygems/ext/ext_conf_builder.rb
View File

@ -31,6 +31,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
run cmd, results run cmd, results
destdir = ENV["DESTDIR"]
ENV["DESTDIR"] = nil
make dest_path, results make dest_path, results
if tmp_dest if tmp_dest
@ -43,6 +46,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
results results
ensure ensure
ENV["RUBYOPT"] = rubyopt ENV["RUBYOPT"] = rubyopt
ENV["DESTDIR"] = destdir
siteconf.close(true) if siteconf siteconf.close(true) if siteconf
FileUtils.rm_rf tmp_dest if tmp_dest FileUtils.rm_rf tmp_dest if tmp_dest
end end