# HG changeset patch # User Ruslan Ermilov # Date 1448874269 -10800 # Node ID 7e241b36819dd399c1a476ae43bf8acdad98a249 # Parent 2c8874c220734a4194d57955910d0178a4730574 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. diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf --- 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"