summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-14 16:13:47 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-14 16:13:47 +0000
commitfa9c5230499f4e613eb0b4449340be3b6edd2cec (patch)
treeef76af07b486d88e0aeae412c41b782cea5911d1 /lib
parent7139427cf313dfc647dd1e6c5a6d1e3829e13280 (diff)
merge revision(s) r47457: [Backport #8315]
* 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_1@47587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2d44b123d2..99fe5d4a6a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1764,6 +1764,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