ruby-changes:21885
From: nobu <ko1@a...>
Date: Sat, 3 Dec 2011 07:17:46 +0900 (JST)
Subject: [ruby-changes:21885] nobu:r33934 (trunk): * Makefile.in (CFLAGS): append ARCH_FLAG.
nobu 2011-12-03 07:17:34 +0900 (Sat, 03 Dec 2011) New Revision: 33934 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33934 Log: * Makefile.in (CFLAGS): append ARCH_FLAG. * configure.in (ARCH_FLAG): exclude from CFLAGS. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/configure.in trunk/lib/mkmf.rb Index: configure.in =================================================================== --- configure.in (revision 33933) +++ configure.in (revision 33934) @@ -2696,9 +2696,9 @@ fi if test "${ARCH_FLAG}"; then archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'` - CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` - CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` - LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` + CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'` + CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'` + LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'` fi warnflags="$rb_cv_warnflags" AC_SUBST(cppflags, [])dnl Index: ChangeLog =================================================================== --- ChangeLog (revision 33933) +++ ChangeLog (revision 33934) @@ -1,5 +1,9 @@ -Sat Dec 3 07:14:23 2011 Nobuyoshi Nakada <nobu@r...> +Sat Dec 3 07:17:29 2011 Nobuyoshi Nakada <nobu@r...> + * Makefile.in (CFLAGS): append ARCH_FLAG. + + * configure.in (ARCH_FLAG): exclude from CFLAGS. + * configure.in (UNIVERSAL_INTS): include short int. fix for test/mkmf. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 33933) +++ lib/mkmf.rb (revision 33934) @@ -1758,7 +1758,7 @@ optflags = #{CONFIG['optflags']} debugflags = #{CONFIG['debugflags']} warnflags = #{$warnflags} -CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG +CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG) INCFLAGS = -I. #$INCFLAGS DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} @@ -1766,7 +1766,7 @@ ldflags = #{$LDFLAGS} dldflags = #{$DLDFLAGS} ARCH_FLAG = #{$ARCH_FLAG} -DLDFLAGS = $(ldflags) $(dldflags) +DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) LDSHARED = #{CONFIG['LDSHARED']} LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} AR = #{CONFIG['AR']} Index: Makefile.in =================================================================== --- Makefile.in (revision 33933) +++ Makefile.in (revision 33934) @@ -48,7 +48,7 @@ OUTFLAG = @OUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty) ARCH_FLAG = @ARCH_FLAG@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ $(ARCH_FLAG) cflags = @cflags@ optflags = @optflags@ debugflags = @debugflags@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/