diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-09 00:02:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-09 00:02:08 +0000 |
commit | 5be82d14872e0a65c1df1a4c557817911e8bc42e (patch) | |
tree | cb68c14b2c2c87877a4b04f80ce46226734db4ff | |
parent | 49db57f7078620a7fd96d26132b96f4a66a1dbfb (diff) | |
download | ruby-5be82d14872e0a65c1df1a4c557817911e8bc42e.tar.gz |
mkmf.rb: --cflags to $CXXFLAGS
* 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/trunk@47457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/mkmf.rb | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Tue Sep 9 09:02:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also + $CXXFLAGS, as they are often used by C++ compiler. + [ruby-core:54532] [Bug #8315] + Tue Sep 9 07:03:22 2014 Eric Wong <e@80x24.org> * compile.c: remove needless SYM2ID <-> ID2SYM conversions diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6177e04f56..c2690969b4 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1778,6 +1778,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 |