mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ext_conf_builder.rb: clear DESTDIR
* 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:
parent
001e06ed36
commit
66867b0a63
1 changed files with 4 additions and 0 deletions
|
@ -31,6 +31,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|||
|
||||
run cmd, results
|
||||
|
||||
destdir = ENV["DESTDIR"]
|
||||
ENV["DESTDIR"] = nil
|
||||
|
||||
make dest_path, results
|
||||
|
||||
if tmp_dest
|
||||
|
@ -43,6 +46,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|||
results
|
||||
ensure
|
||||
ENV["RUBYOPT"] = rubyopt
|
||||
ENV["DESTDIR"] = destdir
|
||||
siteconf.close(true) if siteconf
|
||||
FileUtils.rm_rf tmp_dest if tmp_dest
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue