]> git.kaiwu.me - nginx.git/commitdiff
Configure: improved workaround for system perl on OS X.
authorRuslan Ermilov <ru@nginx.com>
Mon, 30 Nov 2015 09:04:29 +0000 (12:04 +0300)
committerRuslan Ermilov <ru@nginx.com>
Mon, 30 Nov 2015 09:04:29 +0000 (12:04 +0300)
The workaround from baf2816d556d stopped to work because the order of
"-arch x86_64" and "-arch i386" has changed.

auto/lib/perl/conf

index 2a1a3fe3cf24c6281d3dffccc41acec1d5fcb637..4d1bcf128f6095cbdf8bb7432e17af94373011f7 100644 (file)
@@ -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"