diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 04:07:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 04:07:01 +0000 |
| commit | a76288cfc730e0a556e298e7316c5526e292095a (patch) | |
| tree | 68d88a54545ab845d08760366a9288f69a5f5853 /configure.in | |
| parent | 0ecd8c8bc2efe152b90023404fb3bd75c9706b13 (diff) | |
* configure.in (CFLAGS, CXXFLAGS): include additional flags to
CFLAGS and CXXFLAGS while configuration.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in index db7bb14e01..23340e7315 100644 --- a/configure.in +++ b/configure.in @@ -176,7 +176,10 @@ AC_ARG_PROGRAM dnl Checks for programs. -: ${CFLAGS=} ${CXXFLAGS=} +: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'} +: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'} +CFLAGS="${CFLAGS} `eval echo $cflags`" +CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi @@ -1730,8 +1733,11 @@ case "$build_os" in esac CPPFLAGS="$CPPFLAGS "'$(DEFS)' -test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' +cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[][|.*]/\\&/g'` +CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'` +cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[][|.*]/\\&/g'` +CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'` AC_SUBST(cppflags, [])dnl AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl |