1--- configure.orig	2013-12-15 17:29:21.000000000 -0800
2+++ configure	2013-12-15 17:30:05.000000000 -0800
3@@ -5050,7 +5050,7 @@ if test "$GCC" = yes; then
4 esac
5 	done; }
6 else
7-    linker_flag=
8+    linker_flag=-Wl,
9 fi
10 
11 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker is GNU ld" >&5
12@@ -5107,8 +5107,8 @@ fi
13 
14 # RUBY_UNIVERSAL_ARCH begin
15 ARCH_FLAG=`expr " $CFLAGS " : '.* \(-m[0-9][0-9]*\) '`
16-test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *^ *//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
17-test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *^ *//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
18+test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
19+test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
20 unset universal_binary universal_archnames
21 if test ${target_archs+set}; then
22     { $as_echo "$as_me:${as_lineno-$LINENO}: checking target architectures" >&5
23@@ -5135,13 +5135,7 @@ $as_echo "failed" >&6; }
24 esac
25     done
26     target_archs="$universal_binary"
27-    unset universal_binary
28-    case "$target_archs" in #(
29-  *,*) :
30-    universal_binary=yes ;; #(
31-  *) :
32-    unset universal_archnames ;;
33-esac
34+    universal_binary=yes
35     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $target_archs" >&5
36 $as_echo "$target_archs" >&6; }
37 
38@@ -8841,20 +8835,15 @@ else
39 _ACEOF
40 if ac_fn_c_try_compile "$LINENO"; then :
41 
42-	# Check for potential -arch flags.  It is not universal unless
43-	# there are at least two -arch flags with different values.
44+	# Check for potential -arch flags.  It is then universal.
45 	ac_arch=
46 	ac_prev=
47 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
48 	 if test -n "$ac_prev"; then
49 	   case $ac_word in
50 	     i?86 | x86_64 | ppc | ppc64)
51-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
52-		 ac_arch=$ac_word
53-	       else
54 		 ac_cv_c_bigendian=universal
55 		 break
56-	       fi
57 	       ;;
58 	   esac
59 	   ac_prev=
60