diff options
| author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-29 09:43:12 +0000 |
|---|---|---|
| committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-29 09:43:12 +0000 |
| commit | e8792774dff09386a930f4a93fa6fdc864b2e720 (patch) | |
| tree | ce3e8d6b0d33d6b0009eb4659a36f8608c64c4fd | |
| parent | a69f01fa52e3ab47fa700442251f73f47846bb9f (diff) | |
* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Dec 29 18:36:54 2013 Shota Fukumori <her@sorah.jp> + + * 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@ruby-lang.org> * proc.c (mnew_from_me): keep iclass as-is, to make inheritance diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c4e2e5a900..27345275a3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1905,7 +1905,7 @@ CFLAGS = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG) 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 $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 |