Skip to content
Browse files

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
  • Loading branch information...
1 parent cea3a73 commit 2e26edb633606f1e99d22817678e11c25f7d2882 @nobu nobu committed Mar 29, 2013
Showing with 8 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +3 −2 lib/mkmf.rb
View
5 ChangeLog
@@ -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
View
5 lib/mkmf.rb
@@ -1863,11 +1863,12 @@ def configuration(srcdir)
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}

0 comments on commit 2e26edb

Please sign in to comment.
Something went wrong with that request. Please try again.