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

* configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after

Browse Source 
AC_PROG_CC.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-15 03:01:28 +00:00
parent 3c4380ad25
commit f9b71b888c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Sep 15 12:01:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after
AC_PROG_CC.
Tue Sep 15 06:42:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Sep 15 06:42:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (install-all): target to install all. * common.mk (install-all): target to install all.

4
configure.in
View File

@ -155,6 +155,8 @@ AC_ARG_WITH(arch,
entirely, then the package will be built only for the entirely, then the package will be built only for the
target platform]), target platform]),
[target_archs="$withval"], [unset target_archs]) [target_archs="$withval"], [unset target_archs])
AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed 's/ *-arch *[^ ]*//g'` test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed 's/ *-arch *[^ ]*//g'`
test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch *[^ ]*//g'` test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch *[^ ]*//g'`
unset ARCH_FLAG universal_binary universal_archnames unset ARCH_FLAG universal_binary universal_archnames
@ -227,6 +229,7 @@ EOF
fi fi
target_archs="$target_cpu" target_archs="$target_cpu"
fi fi
])
case $target_cpu in case $target_cpu in
when(i?86) frame_address=yes;; when(i?86) frame_address=yes;;
@ -284,6 +287,7 @@ AC_SUBST(OUTFLAG)
AC_SUBST(COUTFLAG) AC_SUBST(COUTFLAG)
RUBY_MINGW32 RUBY_MINGW32
RUBY_UNIVERSAL_ARCH
AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)