nagachika	2014-09-15 11:08:59 +0900 (Mon, 15 Sep 2014)

  New Revision: 47592

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

  Log:
    merge revision(s) r44459,r44470: [Backport #8315]
    
    * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
      Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/mkmf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47591)
+++ ruby_2_1/ChangeLog	(revision 47592)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Sep 15 11:08:23 2014  Shota Fukumori  <her@s...>
+
+	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
+	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
+
 Mon Sep 15 01:06:35 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
Index: ruby_2_1/lib/mkmf.rb
===================================================================
--- ruby_2_1/lib/mkmf.rb	(revision 47591)
+++ ruby_2_1/lib/mkmf.rb	(revision 47592)
@@ -1906,7 +1906,7 @@ CFLAGS   = $(CCDLFLAGS) #$CFLAGS $(ARCH_ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/mkmf.rb#L1906
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
-CXXFLAGS = $(CCDLFLAGS) #{CONFIG['CXXFLAGS']} $(ARCH_FLAG)
+CXXFLAGS = $(CCDLFLAGS) #$CXXFLAGS $(ARCH_FLAG)
 ldflags  = #{$LDFLAGS}
 dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
 ARCH_FLAG = #{$ARCH_FLAG}
@@ -2399,6 +2399,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/mkmf.rb#L2399
       $warnflags = config['warnflags'] unless $extmk
     end
     $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
+    $CXXFLAGS = (with_config("cxxflags", arg_config("CXXFLAGS", config["CXXFLAGS"]))||'').dup
     $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
     $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
     $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47591)
+++ ruby_2_1/version.h	(revision 47592)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-15"
-#define RUBY_PATCHLEVEL 237
+#define RUBY_PATCHLEVEL 238
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44459,44470


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