diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Aug 22 09:58:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand + ::CONFIG which is an alias of MAKEFILE_CONFIG. + Wed Aug 22 09:55:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * struct.c (rb_struct_init_copy): disallow changing the size. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 21fc2fce1f..a5ed57bdc5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -266,8 +266,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, @@ -276,17 +275,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) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-22" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070822 -#define RUBY_PATCHLEVEL 57 +#define RUBY_PATCHLEVEL 58 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |