shyouhei	2018-10-03 13:49:34 +0900 (Wed, 03 Oct 2018)

  New Revision: 64905

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64905

  Log:
    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]

  Modified files:
    trunk/configure.ac
    trunk/tool/m4/ruby_universal_arch.m4
Index: tool/m4/ruby_universal_arch.m4
===================================================================
--- tool/m4/ruby_universal_arch.m4	(revision 64904)
+++ tool/m4/ruby_universal_arch.m4	(revision 64905)
@@ -14,10 +14,7 @@ AS_IF([test ${target_archs+set}], [ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_universal_arch.m4#L14
     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}"
Index: configure.ac
===================================================================
--- configure.ac	(revision 64904)
+++ configure.ac	(revision 64905)
@@ -3687,7 +3687,7 @@ AS_IF([test "${universal_binary-no}" = y https://github.com/ruby/ruby/blob/trunk/configure.ac#L3687
 	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'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/