1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makefile.in (CFLAGS): append ARCH_FLAG.

Browse Source 
* configure.in (ARCH_FLAG): exclude from CFLAGS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-12-02 22:17:34 +00:00
parent 5569d35044
commit 53df70d92b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
Sat Dec 3 07:14:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 3 07:17:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (CFLAGS): append ARCH_FLAG.
* configure.in (ARCH_FLAG): exclude from CFLAGS.
* configure.in (UNIVERSAL_INTS): include short int. fix for * configure.in (UNIVERSAL_INTS): include short int. fix for
test/mkmf. test/mkmf.

2
Makefile.in
View File

@ -48,7 +48,7 @@ empty =
OUTFLAG = @OUTFLAG@$(empty) OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty)
ARCH_FLAG = @ARCH_FLAG@ ARCH_FLAG = @ARCH_FLAG@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ $(ARCH_FLAG)
cflags = @cflags@ cflags = @cflags@
optflags = @optflags@ optflags = @optflags@
debugflags = @debugflags@ debugflags = @debugflags@

6
configure.in
View File

@ -2696,9 +2696,9 @@ if test -n "${cxxflags+set}"; then
fi fi
if test "${ARCH_FLAG}"; then if test "${ARCH_FLAG}"; then
archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'` archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
fi fi
warnflags="$rb_cv_warnflags" warnflags="$rb_cv_warnflags"
AC_SUBST(cppflags, [])dnl AC_SUBST(cppflags, [])dnl

4
lib/mkmf.rb
View File

@ -1758,7 +1758,7 @@ 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 CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG)
INCFLAGS = -I. #$INCFLAGS INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']} DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
@ -1766,7 +1766,7 @@ CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
ldflags = #{$LDFLAGS} ldflags = #{$LDFLAGS}
dldflags = #{$DLDFLAGS} dldflags = #{$DLDFLAGS}
ARCH_FLAG = #{$ARCH_FLAG} ARCH_FLAG = #{$ARCH_FLAG}
DLDFLAGS = $(ldflags) $(dldflags) DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
LDSHARED = #{CONFIG['LDSHARED']} LDSHARED = #{CONFIG['LDSHARED']}
LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
AR = #{CONFIG['AR']} AR = #{CONFIG['AR']}