kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: no CFLAGS in CXXFLAGS

Browse source 
* 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
This commit is contained in:
nobu 2013-03-29 02:09:51 +00:00
parent cea3a73f19
commit 2e26edb633
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 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 * include/ruby/io.h: undef POSIX compliants names on AIX, which are no

5
lib/mkmf.rb
View file

@ -1863,11 +1863,12 @@ cflags = #{CONFIG['cflags']}
optflags = #{CONFIG['optflags']} optflags = #{CONFIG['optflags']}
debugflags = #{CONFIG['debugflags']} debugflags = #{CONFIG['debugflags']}
warnflags = #{$warnflags} warnflags = #{$warnflags}
CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG) CCDLFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']}
CFLAGS = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG)
INCFLAGS = -I. #$INCFLAGS INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']} DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} CXXFLAGS = $(CCDLFLAGS) #{CONFIG['CXXFLAGS']} $(ARCH_FLAG)
ldflags = #{$LDFLAGS} ldflags = #{$LDFLAGS}
dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']} dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
ARCH_FLAG = #{$ARCH_FLAG} ARCH_FLAG = #{$ARCH_FLAG}