comparison auto/lib/perl/conf @ 6308:7e241b36819d

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.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 30 Nov 2015 12:04:29 +0300
parents dde2ae4701e1
children 39a806ccf21e
comparison
equal deleted inserted replaced
6307:2c8874c22073 6308:7e241b36819d
55 fi 55 fi
56 56
57 if [ "$NGX_SYSTEM" = "Darwin" ]; then 57 if [ "$NGX_SYSTEM" = "Darwin" ]; then
58 # OS X system perl wants to link universal binaries 58 # OS X system perl wants to link universal binaries
59 ngx_perl_ldopts=`echo $ngx_perl_ldopts \ 59 ngx_perl_ldopts=`echo $ngx_perl_ldopts \
60 | sed -e 's/-arch x86_64 -arch i386//'` 60 | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
61 fi 61 fi
62 62
63 CORE_LINK="$CORE_LINK $ngx_perl_ldopts" 63 CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
64 LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module" 64 LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module"
65 65