nobu	2013-03-29 11:09:51 +0900 (Fri, 29 Mar 2013)

  New Revision: 39994

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

  Log:
    mkmf.rb: no CFLAGS in CXXFLAGS
    
    * lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
      use different set than C for C++.  [ruby-core:45273] [Bug #6504]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39993)
+++ ChangeLog	(revision 39994)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Mar 29 11:09:48 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
+	  use different set than C for C++.  [ruby-core:45273] [Bug #6504]
+
 Fri Mar 29 10:24:10 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/io.h: undef POSIX compliants names on AIX, which are no
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39993)
+++ lib/mkmf.rb	(revision 39994)
@@ -1863,11 +1863,12 @@ cflags   = #{CONFIG['cflags']} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1863
 optflags = #{CONFIG['optflags']}
 debugflags = #{CONFIG['debugflags']}
 warnflags = #{$warnflags}
-CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG)
+CCDLFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']}
+CFLAGS   = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG)
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
-CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
+CXXFLAGS = $(CCDLFLAGS) #{CONFIG['CXXFLAGS']} $(ARCH_FLAG)
 ldflags  = #{$LDFLAGS}
 dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
 ARCH_FLAG = #{$ARCH_FLAG}

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