From 4f867dddc4408a6f3a192ddb726fae283cfe48df Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 24 Aug 2009 04:14:12 +0000
Subject: [PATCH] * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only
 when   universal binary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 +++++
 configure.in | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6525af8d32..9f461d8275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 24 13:14:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
+	  universal binary.
+
 Mon Aug 24 12:55:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/Makefile.sub (enc/unicode/name2ctype.h): use md instead of
diff --git a/configure.in b/configure.in
index 005a2e30b0..41fee2a019 100644
--- a/configure.in
+++ b/configure.in
@@ -385,10 +385,10 @@ esac
 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 @@ static ac__type_sizeof_ *rbcv_ptr;
     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 @@ ${cond+@%:@endif}
 @%:@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