зеркало из https://github.com/github/ruby.git
support --with-arch=x86_64h
Recent apple machines describe themselves being x86_64h. That architecture is somehow supported by their C compiler and at least by recent clang. However config.sub does not know that fact so making universal binary targeting it is rejected by the program. Why not skip the check by config.sub. [fix GH-1971] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
39c4aeec4c
Коммит
1af6418742
|
@ -3687,7 +3687,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
|
|||
for archs in ${universal_archnames}; do
|
||||
cpu=`echo $archs | sed 's/.*=//'`
|
||||
archs=`echo $archs | sed 's/=.*//'`
|
||||
RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
|
||||
RUBY_DEFINE_IF([defined __${archs}__ &&! defined RUBY_PLATFORM_CPU], RUBY_PLATFORM_CPU, ["${cpu}"])
|
||||
done
|
||||
])
|
||||
ints='long int short'
|
||||
|
|
|
@ -14,10 +14,7 @@ AS_IF([test ${target_archs+set}], [
|
|||
for archs in $target_archs
|
||||
do
|
||||
AS_CASE([",$universal_binary,"],[*",$archs,"*], [],[
|
||||
cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
|
||||
AC_MSG_RESULT([failed])
|
||||
AC_MSG_ERROR([$cpu])
|
||||
}
|
||||
cpu=$archs
|
||||
cpu=`echo $cpu | sed 's/-.*-.*//'`
|
||||
universal_binary="${universal_binary+$universal_binary,}$cpu"
|
||||
universal_archnames="${universal_archnames} ${archs}=${cpu}"
|
||||
|
|
Загрузка…
Ссылка в новой задаче