nagachika	2013-04-14 23:55:53 +0900 (Sun, 14 Apr 2013)

  New Revision: 40291

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40290)
+++ ruby_2_0_0/ChangeLog	(revision 40291)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Apr 14 23:49: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]
+
 Sun Apr 14 23:43:06 2013  NARUSE, Yui  <naruse@r...>
 
 	* ext/fiddle/closure.c (initialize): check mprotect's return value.
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 40290)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 40291)
@@ -1840,11 +1840,12 @@ cflags   = #{CONFIG['cflags']} https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L1840
 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}
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40290)
+++ ruby_2_0_0/version.h	(revision 40291)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-14"
-#define RUBY_PATCHLEVEL 126
+#define RUBY_PATCHLEVEL 127
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39994


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