[前][次][番号順一覧][スレッド一覧]

ruby-changes:32380

From: sorah <ko1@a...>
Date: Sun, 29 Dec 2013 18:43:19 +0900 (JST)
Subject: [ruby-changes:32380] sorah:r44459 (trunk): * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.

sorah	2013-12-29 18:43:12 +0900 (Sun, 29 Dec 2013)

  New Revision: 44459

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

  Log:
    * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
      Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44458)
+++ ChangeLog	(revision 44459)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Dec 29 18:36:54 2013  Shota Fukumori  <her@s...>
+
+	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
+	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
+
 Sun Dec 29 12:11:11 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 44458)
+++ lib/mkmf.rb	(revision 44459)
@@ -1905,7 +1905,7 @@ CFLAGS   = $(CCDLFLAGS) #$CFLAGS $(ARCH_ https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1905
 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}
@@ -2398,6 +2398,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2398
       $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

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

[前][次][番号順一覧][スレッド一覧]