diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 02:08:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 02:08:59 +0000 |
| commit | d67632d206ff7a5d2366d94d8badb0b6228487d4 (patch) | |
| tree | 1de25995db9de0ce4d138fac34fe12c9e0c3c0ea /lib | |
| parent | fa9c5230499f4e613eb0b4449340be3b6edd2cec (diff) | |
merge revision(s) r44459,r44470: [Backport #8315]
* 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/branches/ruby_2_1@47592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 99fe5d4a6a..b408ed780f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1906,7 +1906,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} @@ -2399,6 +2399,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 |