From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 17 Jun 2014 08:07:06 +0000 (+0400)
Subject: Configure: workaround for system perl on OS X (ticket #576).
X-Git-Tag: release-1.7.2~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=52222dcda66126aaf073083b752c29d4425b9511;p=nginx.git

Configure: workaround for system perl on OS X (ticket #576).
---

diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index 2fbaa76b7..91009f15e 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -52,6 +52,11 @@ if test -n "$NGX_PERL_VER"; then
         ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'`
     fi
 
+    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//'`
+    fi
+
     CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
     LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext"