diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-03 04:49:34 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-03 04:49:34 +0000 |
| commit | 1af64187420d4aa5cd7955041a582bbdadcf8f42 (patch) | |
| tree | 2dec77ed7c4fda30d457ea8b24b42e7c166e23b9 | |
| parent | 39c4aeec4cf9f127ecb4b0cae92c58540fea6a7c (diff) | |
| download | ruby-1af64187420d4aa5cd7955041a582bbdadcf8f42.tar.gz | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tool/m4/ruby_universal_arch.m4 | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 367a072720..fb7c5c97d8 100644 --- a/configure.ac +++ b/configure.ac @@ -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' diff --git a/tool/m4/ruby_universal_arch.m4 b/tool/m4/ruby_universal_arch.m4 index 30f300a9fd..a524bc2592 100644 --- a/tool/m4/ruby_universal_arch.m4 +++ b/tool/m4/ruby_universal_arch.m4 @@ -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}" |