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 /configure.in | |
| 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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
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 |