knu	2010-01-01 15:43:55 +0900 (Fri, 01 Jan 2010)

  New Revision: 26226

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26226

  Log:
    * lib/mkmf.rb: Fix build.  COUTFLAG is not yet landed on this
      branch.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26225)
+++ ruby_1_8/ChangeLog	(revision 26226)
@@ -1,3 +1,8 @@
+Fri Jan  1 15:42:46 2010  Akinori MUSHA  <knu@i...>
+
+	* lib/mkmf.rb: Fix build.  COUTFLAG is not yet landed on this
+	  branch.
+
 Fri Jan  1 00:47:57 2010  Akinori MUSHA  <knu@i...>
 
 	* ext/digest/digest.c (rb_digest_instance_method_unimpl): Suppress
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 26225)
+++ ruby_1_8/lib/mkmf.rb	(revision 26226)
@@ -171,7 +171,6 @@
 end
 
 OUTFLAG = CONFIG['OUTFLAG']
-COUTFLAG = CONFIG['COUTFLAG']
 CPPOUTFILE = CONFIG['CPPOUTFILE']
 
 CONFTEST_C = "conftest.c".freeze
@@ -1457,7 +1456,6 @@
 LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
 LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
 OUTFLAG = #{OUTFLAG}
-COUTFLAG = #{COUTFLAG}
 
 RUBY_EXTCONF_H = #{$extconf_h}
 cflags   = #{CONFIG['cflags']}
@@ -1997,8 +1995,8 @@
 
 COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
 RULE_SUBST = config_string('RULE_SUBST')
-COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
-COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
+COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(OUTFLAG)$@ -c $<'
+COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(OUTFLAG)$@ -c $<'
 TRY_LINK = config_string('TRY_LINK') ||
   "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
   "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/