[nginx] Configure: improved workaround for system perl on OS X.
Ruslan Ermilov
ru at nginx.com
Mon Nov 30 19:37:50 UTC 2015
details: http://hg.nginx.org/nginx/rev/7e241b36819d
branches:
changeset: 6308:7e241b36819d
user: Ruslan Ermilov <ru at nginx.com>
date: Mon Nov 30 12:04:29 2015 +0300
description:
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.
diffstat:
auto/lib/perl/conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 2c8874c22073 -r 7e241b36819d auto/lib/perl/conf
--- a/auto/lib/perl/conf Mon Nov 30 19:01:53 2015 +0300
+++ b/auto/lib/perl/conf Mon Nov 30 12:04:29 2015 +0300
@@ -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"
More information about the nginx-devel
mailing list