From 66867b0a63b62c80c8596efe34ad1ba43598e709 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Mar 2013 01:06:08 +0000
Subject: 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
---
 lib/rubygems/ext/ext_conf_builder.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/rubygems/ext/ext_conf_builder.rb')

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
-- 
cgit v1.2.3