diff options
| -rw-r--r-- | auto/modules/perl | 4 | ||||
| -rw-r--r-- | auto/os/conf | 9 | ||||
| -rw-r--r-- | auto/os/test | 2 | ||||
| -rw-r--r-- | auto/threads | 3 | ||||
| -rw-r--r-- | src/go/unit/darwin-cflags.go | 13 |
5 files changed, 1 insertions, 30 deletions
diff --git a/auto/modules/perl b/auto/modules/perl index 22f52136..4d59873e 100644 --- a/auto/modules/perl +++ b/auto/modules/perl @@ -68,10 +68,6 @@ if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \", # OS X system perl wants to link universal binaries NXT_PERL_LDOPTS=`echo $NXT_PERL_LDOPTS \ | 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 NXT_PERL_LIBS="-L ${NXT_PERL_INCPATH} ${NXT_PERL_LDOPTS}" diff --git a/auto/os/conf b/auto/os/conf index 932b8aba..df8b2683 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -100,19 +100,10 @@ case "$NXT_SYSTEM" in # HFS+ volumes are caseless by default. 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_SHARED_LINK="\$(CC) -dynamiclib" NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \ -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_EXEC_LINK="\$(CC)" diff --git a/auto/os/test b/auto/os/test index 563244a6..3188d3db 100644 --- a/auto/os/test +++ b/auto/os/test @@ -40,8 +40,6 @@ case "$NXT_SYSTEM" in NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` echo=echo CC=${CC:-cc} - - NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.6" ;; AIX) diff --git a/auto/threads b/auto/threads index 9187caab..d6efc7cd 100644 --- a/auto/threads +++ b/auto/threads @@ -203,8 +203,7 @@ fi # Thread Local Storage / Thread Specific Data. # # Linux, FreeBSD 5.3, Solaris. -# MacOSX 10.7 (Lion) Clang. However, if the -mmacosx-version-min -# option is specified it must be at least 10.7. +# MacOSX 10.7 (Lion) Clang. nxt_feature="__thread" nxt_feature_name=NXT_HAVE_THREAD_STORAGE_CLASS diff --git a/src/go/unit/darwin-cflags.go b/src/go/unit/darwin-cflags.go deleted file mode 100644 index a5e37c39..00000000 --- a/src/go/unit/darwin-cflags.go +++ /dev/null @@ -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" |