diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
4 files changed, 11 insertions, 7 deletions
@@ -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 test/mkmf. diff --git a/Makefile.in b/Makefile.in index e614635dff..3441c14169 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,7 +48,7 @@ empty = OUTFLAG = @OUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty) ARCH_FLAG = @ARCH_FLAG@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ $(ARCH_FLAG) cflags = @cflags@ optflags = @optflags@ debugflags = @debugflags@ diff --git a/configure.in b/configure.in index 46462785d5..3ac39b50bd 100644 --- a/configure.in +++ b/configure.in @@ -2696,9 +2696,9 @@ if test -n "${cxxflags+set}"; then 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 diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 302490dc65..ff30feb570 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1758,7 +1758,7 @@ cflags = #{CONFIG['cflags']} 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 @@ CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} 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']} |