technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed -mmacosx-version-min option.

Browse Source
This commit is contained in:
Igor Sysoev
2018-06-28 18:31:27 +03:00
parent 50228b35b6
commit 313da403a5
5 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auto/modules/perl
View File

@@ -68,10 +68,6 @@ if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \",
# OS X system perl wants to link universal binaries # OS X system perl wants to link universal binaries
NXT_PERL_LDOPTS=`echo $NXT_PERL_LDOPTS \ NXT_PERL_LDOPTS=`echo $NXT_PERL_LDOPTS \
| sed -e 's/-arch i386//' -e 's/-arch x86_64//'` | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
# macosx-version-min is already defined for Darwin
NXT_PERL_LDOPTS=`echo $NXT_PERL_LDOPTS \
| $NXT_PERL -pe 's/-mmacosx-version-min=\d+\.\d+//'`
fi fi
NXT_PERL_LIBS="-L ${NXT_PERL_INCPATH} ${NXT_PERL_LDOPTS}" NXT_PERL_LIBS="-L ${NXT_PERL_INCPATH} ${NXT_PERL_LDOPTS}"

9
auto/os/conf
View File

@@ -100,19 +100,10 @@ case "$NXT_SYSTEM" in
# HFS+ volumes are caseless by default. # HFS+ volumes are caseless by default.
nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have
# MacOSX 10.6 (Snow Leopard) has deprecated ucontext(3).
# MacOSX 10.7 (Lion) has deprecated system OpenSSL.
# MAC_OS_X_VERSION_MIN_REQUIRED macro does not help.
# "-rpath" is supported since MacOSX 10.5 (Leopard).
NXT_CFLAGS="$NXT_CFLAGS -mmacosx-version-min=10.6"
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="ar -r -c"
NXT_SHARED_LINK="\$(CC) -dynamiclib" NXT_SHARED_LINK="\$(CC) -dynamiclib"
NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \ NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \
-install_name @executable_path/libnxt.dylib" -install_name @executable_path/libnxt.dylib"
# Prior to MacOSX 10.5 (Leopard) only bundles could be unloaded.
# NXT_MODULE_LINK="\$(CC) -bundle -undefined dynamic_lookup"
NXT_MODULE_LINK="\$(CC) -dynamiclib -undefined dynamic_lookup" NXT_MODULE_LINK="\$(CC) -dynamiclib -undefined dynamic_lookup"
NXT_EXEC_LINK="\$(CC)" NXT_EXEC_LINK="\$(CC)"

2
auto/os/test
View File

@@ -40,8 +40,6 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=echo echo=echo
CC=${CC:-cc} CC=${CC:-cc}
NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.6"
;; ;;
AIX) AIX)

3
auto/threads
View File

@@ -203,8 +203,7 @@ fi
# Thread Local Storage / Thread Specific Data. # Thread Local Storage / Thread Specific Data.
# #
# Linux, FreeBSD 5.3, Solaris. # Linux, FreeBSD 5.3, Solaris.
# MacOSX 10.7 (Lion) Clang. However, if the -mmacosx-version-min # MacOSX 10.7 (Lion) Clang.
# option is specified it must be at least 10.7.
nxt_feature="__thread" nxt_feature="__thread"
nxt_feature_name=NXT_HAVE_THREAD_STORAGE_CLASS nxt_feature_name=NXT_HAVE_THREAD_STORAGE_CLASS

13
src/go/unit/darwin-cflags.go
View File

@@ -1,13 +0,0 @@
// +build darwin
/*
* Copyright (C) Max Romanov
* Copyright (C) NGINX, Inc.
*/
package unit
/*
#cgo CFLAGS: -mmacosx-version-min=10.5
*/
import "C"