diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-29 02:09:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-29 02:09:51 +0000 |
| commit | 2e26edb633606f1e99d22817678e11c25f7d2882 (patch) | |
| tree | 4c87c8d46e958c2ef1886ceca612b6599cd5338f | |
| parent | cea3a73f19c2f6124dbf04af6c8160d872d19bfc (diff) | |
| download | ruby-2e26edb633606f1e99d22817678e11c25f7d2882.tar.gz | |
mkmf.rb: no CFLAGS in CXXFLAGS
* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
use different set than C for C++. [ruby-core:45273] [Bug #6504]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Mar 29 11:09:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to + use different set than C for C++. [ruby-core:45273] [Bug #6504] + Fri Mar 29 10:24:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/io.h: undef POSIX compliants names on AIX, which are no diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0fd930b47c..90d28ab449 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1863,11 +1863,12 @@ cflags = #{CONFIG['cflags']} optflags = #{CONFIG['optflags']} debugflags = #{CONFIG['debugflags']} warnflags = #{$warnflags} -CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG) +CCDLFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} +CFLAGS = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG) INCFLAGS = -I. #$INCFLAGS DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} -CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} +CXXFLAGS = $(CCDLFLAGS) #{CONFIG['CXXFLAGS']} $(ARCH_FLAG) ldflags = #{$LDFLAGS} dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']} ARCH_FLAG = #{$ARCH_FLAG} |