summaryrefslogtreecommitdiffhomepage
path: root/auto/unix
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-08-29 12:50:35 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-08-29 12:50:35 +0000
commit1c95e6c3050bf2114d72029824fdadf001cc300e (patch)
tree23864a9f2f926e862609fbef516ad07156dbdc14 /auto/unix
parentef24db717ca6bc87d2214f3d7c103cac8ced9066 (diff)
downloadnginx-1c95e6c3050bf2114d72029824fdadf001cc300e.tar.gz
nginx-1c95e6c3050bf2114d72029824fdadf001cc300e.tar.bz2
Merge of r4004, r4005:
Solaris related fixes: *) Detect POSIX semaphores in librt on Solaris (ticket #3). Patch by Denis Ivanov. *) Lower optimization level for Sun Studio before 12.1. At least Sun Studio 12 has problems with bit-fields exposed by nginx code (caught by test suite). They seems to be fixed in Sun Studio 12.1. As a workaround use "-fast -xalias_level=any" for older versions, it resolves the problem.
Diffstat (limited to '')
-rwxr-xr-xauto/unix13
1 files changed, 13 insertions, 0 deletions
diff --git a/auto/unix b/auto/unix
index 190d4a43f..b3541c56e 100755
--- a/auto/unix
+++ b/auto/unix
@@ -620,6 +620,19 @@ if [ $ngx_found = no ]; then
fi
+if [ $ngx_found = no ]; then
+
+ # Solaris has POSIX semaphores in librt
+ ngx_feature="POSIX semaphores in librt"
+ ngx_feature_libs=-lrt
+ . auto/feature
+
+ if [ $ngx_found = yes ]; then
+ CORE_LIBS="$CORE_LIBS -lrt"
+ fi
+fi
+
+
ngx_feature="struct msghdr.msg_control"
ngx_feature_name="NGX_HAVE_MSGHDR_MSG_CONTROL"
ngx_feature_run=no