diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 14:28:56 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 14:28:56 +0000 |
| commit | a4e52a1a85f5c6e628cd45332a243c581942a161 (patch) | |
| tree | d11c43d637ff11f2c61411f1b64708f69d291266 /lib | |
| parent | b28cb4fa85e141970457a2e9f9411d55a2e13bf6 (diff) | |
merge revision(s) 39590,39592: [Backport #7991]
* 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/branches/ruby_2_0_0@39792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 2977cf0207..3df7637581 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -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 |