nobu	2009-08-24 13:14:12 +0900 (Mon, 24 Aug 2009)

  New Revision: 24634

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24634

  Log:
    * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
      universal binary.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 24633)
+++ configure.in	(revision 24634)
@@ -385,10 +385,10 @@
 AC_CHECK_TYPES([long long, off_t])
 
 AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
-    [cross_compiling=yes
+    [test "$universal_binary" = yes && cross_compiling=yes
     AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
 	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
-    cross_compiling=$real_cross_compiling])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
 
 dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
 AC_DEFUN([RUBY_CHECK_SIZEOF],
@@ -433,7 +433,7 @@
     m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
     when([SIZEOF_*]);;
     when(*)])
-    cross_compiling=yes
+    test "$universal_binary" = yes && cross_compiling=yes
     AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
 [${cond+$cond
 @%:@else}
@@ -442,7 +442,7 @@
 @%:@ifndef AS_TR_CPP(SIZEOF_$1)
 @%:@define AS_TR_CPP(SIZEOF_$1) 0
 @%:@endif], [t=0])
-    cross_compiling=$real_cross_compiling
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
     if test ${t-0} != 0; then
 	AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
     fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24633)
+++ ChangeLog	(revision 24634)
@@ -1,3 +1,8 @@
+Mon Aug 24 13:14:06 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
+	  universal binary.
+
 Mon Aug 24 12:55:19 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/Makefile.sub (enc/unicode/name2ctype.h): use md instead of

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