diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-10 09:59:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-10 09:59:19 +0000 |
| commit | 7c669071c4755496a4dcdd0243783adbecc03f95 (patch) | |
| tree | 47f7c883bd20d44019f9329f3ce9bcf8a688fc02 | |
| parent | 66150a89a69ed16953d40af8383206f339dcd5ac (diff) | |
| download | ruby-7c669071c4755496a4dcdd0243783adbecc03f95.tar.gz | |
* configure.in (cflags, cxxflags): remove duplicating options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Sat Oct 10 18:59:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (cflags, cxxflags): remove duplicating options. + Sat Oct 10 18:19:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp), diff --git a/configure.in b/configure.in index 22b056a300..3b6d2bb111 100644 --- a/configure.in +++ b/configure.in @@ -239,11 +239,20 @@ AC_ARG_PROGRAM dnl Checks for programs. +cflagspat= +test -z "$optflags" || + cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g' +test -z "$debugflags" || + cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g' +test -z "warnflags" || + cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g' if test -z "${CFLAGS+set}"; then + cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"` orig_cflags="$cflags" cflags="$cflags "'${optflags} ${debugflags} ${warnflags}' fi if test -z "${CXXFLAGS+set}"; then + cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"` orig_cxxflags="$cxxflags" cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}' fi |