diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:39:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:39:43 +0000 |
| commit | d22e2877631257013dcd92f3428e259723783dd0 (patch) | |
| tree | 825af8f96da31147f1635897accbd73be1a2c6f7 | |
| parent | 9da8b416991a50e56180be84410c8d34e2a732bf (diff) | |
merge revision(s) 33934: [Backport #5975]
* Makefile.in (CFLAGS): append ARCH_FLAG.
* configure.in (ARCH_FLAG): exclude from CFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Wed Feb 8 10:38:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (CFLAGS): append ARCH_FLAG. + + * configure.in (ARCH_FLAG): exclude from CFLAGS. + Wed Feb 08 09:19:00 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_cipher.c: Add warning about key as IV. diff --git a/Makefile.in b/Makefile.in index bcdaf5f7a9..b0f4434f72 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 92e8fa084d..1b3449b373 100644 --- a/configure.in +++ b/configure.in @@ -2692,9 +2692,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 59c2c8509a..686a61fb96 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1694,7 +1694,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} @@ -1702,7 +1702,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']} @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 57 +#define RUBY_PATCHLEVEL 58 #define RUBY_RELEASE_DATE "2012-02-08" #define RUBY_RELEASE_YEAR 2012 |