1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal

binary.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-06 17:25:28 +00:00
parent 8ebd0d4320
commit 254446f555
2 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Tue Apr 7 02:25:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal
binary.
Tue Apr 7 01:08:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_to_s): reduce fragments if no precision lost.

View file

@ -348,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"
fi
test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && CFLAGS="`eval echo $cflags`"
test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && CXXFLAGS="`eval echo $cxxflags`"
test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
dnl check for large file stuff
mv confdefs.h confdefs1.h
@ -2187,11 +2187,11 @@ if test "${universal_binary-no}" = yes ; then
], [
AC_MSG_RESULT(no)
archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
for archs in ${universal_archnames}; do
cpu=${archs#*=}
archs=${archs%=*}
CFLAGS="$cflags -arch $archs"
CFLAGS="$new_cflags -arch $archs"
archs="__${archs}__"
AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
AC_TRY_COMPILE([@%:@ifndef ${archs}