diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:56:04 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:56:04 +0000 |
| commit | 6227751f9f65f2a755f7ac24335a36bbc80cca65 (patch) | |
| tree | 764d6ae55fc9e35f3b759c19e8122e4bb3a80d71 /lib/mkmf.rb | |
| parent | 290610c1527c2206e1c1c99a7cef2c1c0bb50120 (diff) | |
| parent | 43ee6d49174a82ab39c0522b3ec4d0e331fd63ba (diff) | |
sorry. I made wrong tags.v1_8_5_68
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_68@12996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d0beca6c22..43ba202bed 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -266,7 +266,8 @@ ensure end def link_command(ldflags, opt="", libpath=$LIBPATH) - conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, + Config::expand(TRY_LINK.dup, + CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => CONFTEST_C, 'INCFLAGS' => $INCFLAGS, 'CPPFLAGS' => $CPPFLAGS, @@ -275,20 +276,17 @@ def link_command(ldflags, opt="", libpath=$LIBPATH) 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", - 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS") - Config::expand(TRY_LINK.dup, conf) + 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")) 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}", - conf) + CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) 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}", - conf) + CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) end def libpathflag(libpath=$LIBPATH) |