diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 14:55:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 14:55:53 +0000 |
| commit | 303568e6055ce8c5b774f3a06efbb62743d48be0 (patch) | |
| tree | 3ab417d2120ed438c85f5626d06b1b15f4add934 /lib | |
| parent | aa69372cf806f77c8dd9947eda4662305bb6b12f (diff) | |
merge revision(s) 39994: [Backport #6504]
* 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/branches/ruby_2_0_0@40291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index e396fb267f..cca487e438 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1840,11 +1840,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} |