sorry. I made wrong tags.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/tags/v1_8_5_68@12996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
brentr · Aug 15, 2007 · 772e0b4 · 772e0b4
2 parents bece4f2 + be9a257
commit 772e0b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,3 @@
-Thu Aug 16 04:54:45 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.
-
 Thu Aug 16 04:53:21 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
@@ -266,7 +266,8 @@ def try_do(src, command, &b)
 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)

diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-16"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 68
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8