From f83fb0b4b2b2bba18cb07f0d395588f8bb8b5630 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 17 Sep 2014 06:03:36 +0000 Subject: merge revision(s) 44459,44470,47457: [Backport #8315] * lib/mkmf.rb (configuration): Make CXXFLAGS customizable. Patch by Kohei Suzuki (eagletmt). [Fixes GH-492] * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also $CXXFLAGS, as they are often used by C++ compiler. [ruby-core:54532] [Bug #8315] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/mkmf.rb') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d7dc1b1a9b..8b19eb6ba6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1727,6 +1727,7 @@ SRC libs = get['libs-only-l'] ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ") $CFLAGS += " " << cflags + $CXXFLAGS += " " << cflags $LDFLAGS = [orig_ldflags, ldflags].join(' ') $libs += " " << libs Logging::message "package configuration for %s\n", pkg @@ -1859,7 +1860,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} @@ -2339,6 +2340,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 -- cgit v1.2.3