From 2915c155e825d5e012b2b4489ac11fc20759ed44 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 Jul 2011 08:29:21 +0000
Subject: * configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.   Bug #4977

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

diff --git a/ChangeLog b/ChangeLog
index 5bb44eda9e..75aab676b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 16 17:29:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.
+	  Bug #4977
+
 Sat Jul 16 06:27:51 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/uri/common.rb (module): Remove optional parser argument to
diff --git a/configure.in b/configure.in
index 5129e7944d..29c5c126eb 100644
--- a/configure.in
+++ b/configure.in
@@ -155,9 +155,10 @@ AC_MSG_RESULT([$ARCH_FLAG])
 
 AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
 # RUBY_UNIVERSAL_ARCH begin
+ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
 test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
 test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
-unset ARCH_FLAG universal_binary universal_archnames
+unset universal_binary universal_archnames
 if test ${target_archs+set}; then
     AC_MSG_CHECKING([target architectures])
     target_archs=`echo $target_archs | tr , ' '`
@@ -202,8 +203,6 @@ if test ${target_archs+set}; then
     fi
     AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
     AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
-    CFLAGS="$CFLAGS ${ARCH_FLAG}"
-    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
 else
     if test x"$target_alias" = x; then
 	AS_CASE(["$target_os"],
@@ -236,6 +235,10 @@ if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
 else
     rb_cv_target_archs=${target_archs}
 fi
+if test "x${ARCH_FLAG}" != x; then
+    CFLAGS="$CFLAGS ${ARCH_FLAG}"
+    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
+fi
 # RUBY_UNIVERSAL_ARCH end
 ])
 
-- 
cgit v1.2.3