From 62ae9544fecfe3dcb27c5782092d2e463e0434a3 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@nginx.com>
Date: Mon, 30 Nov 2015 12:04:29 +0300
Subject: [PATCH] Configure: improved workaround for system perl on OS X.

The workaround from baf2816d556d stopped to work because the order of
"-arch x86_64" and "-arch i386" has changed.
---
 auto/lib/perl/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index 2a1a3fe3c..4d1bcf128 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -57,7 +57,7 @@ if test -n "$NGX_PERL_VER"; then
     if [ "$NGX_SYSTEM" = "Darwin" ]; then
         # OS X system perl wants to link universal binaries
         ngx_perl_ldopts=`echo $ngx_perl_ldopts \
-                         | sed -e 's/-arch x86_64 -arch i386//'`
+                         | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
     fi
 
     CORE_LINK="$CORE_LINK $ngx_perl_ldopts"