1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (CFLAGS, CXXFLAGS): override with $cflags and

Browse Source 
$cxxflags if not given.  [ruby-core:23130]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-06 14:16:10 +00:00
parent d456f0aabe
commit aa75b002de
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,7 +1,7 @@
Mon Apr 6 20:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CFLAGS, CXXFLAGS): use orignal values if given. * configure.in (CFLAGS, CXXFLAGS): override with $cflags and
[ruby-core:23130] $cxxflags if not given. [ruby-core:23130]
Mon Apr 6 19:26:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 6 19:26:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>

11
configure.in
View File

@ -216,12 +216,13 @@ dnl Checks for programs.
if test -z "${CFLAGS+set}"; then if test -z "${CFLAGS+set}"; then
orig_cflags="$cflags" orig_cflags="$cflags"
cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'} cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
fi fi
if test -z "${CXXFLAGS+set}"; then if test -z "${CXXFLAGS+set}"; then
orig_cxxflags="$cxxflags" orig_cxxflags="$cxxflags"
cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'} cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
fi fi
if test x"${build}" != x"${host}"; then if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc) AC_CHECK_TOOL(CC, gcc)
fi fi
@ -347,8 +348,8 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings" warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings"
fi fi
test -n "${cflags+set}" && CFLAGS="${CFLAGS} `eval echo $cflags`" test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && CFLAGS="`eval echo $cflags`"
test -n "${cxxflags+set}" && CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && CXXFLAGS="`eval echo $cxxflags`"
dnl check for large file stuff dnl check for large file stuff
mv confdefs.h confdefs1.h mv confdefs.h confdefs1.h
@ -2219,7 +2220,7 @@ if test "${ARCH_FLAG}"; then
LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'` LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
fi fi
AC_SUBST(cppflags, [])dnl AC_SUBST(cppflags, [])dnl
AC_SUBST(cflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(optflags)dnl AC_SUBST(optflags)dnl
AC_SUBST(debugflags)dnl AC_SUBST(debugflags)dnl