From 90e1093a1479a59325e89e32cc8610be1cd640a0 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 14 Aug 2010 08:11:59 +0000 Subject: [PATCH] merges r28628 from trunk into ruby_1_9_2. -- * configure.in: fix for universal binary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index b3c5642fcf..e97216f557 100644 --- a/configure.in +++ b/configure.in @@ -287,7 +287,7 @@ AC_SUBST(COUTFLAG) RUBY_MINGW32 RUBY_UNIVERSAL_ARCH -if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no; then +if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then RUBY_DEFAULT_ARCH("$target_cpu") fi