diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-13 01:10:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-13 01:10:48 +0000 |
commit | 22c20cd4d9d900011b3a697654efcd46c3e06bc4 (patch) | |
tree | 6d94d66a2f2861d79b73b17d62c4f7ee6fb05935 /lib/mkmf.rb | |
parent | 420a5fe48efdde608671395bd4eb7583a60d38ef (diff) |
* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
::CONFIG which is an alias of MAKEFILE_CONFIG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 338b7c5242..a7247ca83b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -271,8 +271,7 @@ ensure end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) - Config::expand(TRY_LINK.dup, - CONFIG.merge('hdrdir' => $hdrdir.quote, + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => CONFTEST_C, 'INCFLAGS' => $INCFLAGS, 'CPPFLAGS' => $CPPFLAGS, @@ -281,17 +280,20 @@ 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") + Config::expand(TRY_LINK.dup, conf) end def cc_command(opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", - CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) + conf) end def cpp_command(outfile, opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", - CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) + conf) end def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) |