From b4d94ffa661a281cde44d8c0c31611894f85e678 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Jul 2007 01:10:48 +0000
Subject: * lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand 
  ::CONFIG which is an alias of MAKEFILE_CONFIG.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ab039b1d9..529567a71 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -281,8 +281,7 @@ ensure
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
-  RbConfig::expand(TRY_LINK.dup,
-                   CONFIG.merge('hdrdir' => $hdrdir.quote,
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
                                 'src' => CONFTEST_C,
                                 'arch_hdrdir' => "#$arch_hdrdir",
                                 'top_srcdir' => $top_srcdir.quote,
@@ -293,21 +292,24 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
                                 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
                                 'LIBPATH' => libpathflag(libpath),
                                 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
-                                'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS"))
+                                'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
+  RbConfig::expand(TRY_LINK.dup, conf)
 end
 
 def cc_command(opt="")
-  RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
-		   CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
                                 'arch_hdrdir' => "#$arch_hdrdir",
-                                'top_srcdir' => $top_srcdir.quote))
+                                'top_srcdir' => $top_srcdir.quote)
+  RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
+		   conf)
 end
 
 def cpp_command(outfile, opt="")
-  RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
-		   CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
+  conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
                                 'arch_hdrdir' => "#$arch_hdrdir",
-                                'top_srcdir' => $top_srcdir.quote))
+                                'top_srcdir' => $top_srcdir.quote)
+  RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
+		   conf)
 end
 
 def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
-- 
cgit