Mercurial > hg > nginx

changeset 5714:80bd391c90d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: added -Wno-deprecated-declarations on OS X. Previous workaround to avoid warnings on OS X due to deprecated system OpenSSL library (introduced in a3870ea96ccd) no longer works, as the MAC_OS_X_VERSION_MIN_REQUIRED macro is ignored on OS X 10.9 if a compiler used supports __attribute__(availability).
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 28 May 2014 17:41:44 +0400
parents 9b0c92f22bbf
children 790ba7484bb6
files auto/cc/clang auto/cc/gcc src/os/unix/ngx_darwin_config.h
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/auto/cc/clang
+++ b/auto/cc/clang
@@ -88,6 +88,11 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
 # we have a lot of unused function arguments
 CFLAGS="$CFLAGS -Wno-unused-parameter"
 
+# deprecated system OpenSSL library on OS X
+if [ "$NGX_SYSTEM" = "Darwin" ]; then
+    CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+fi
+
 # stop on warning
 CFLAGS="$CFLAGS -Werror"
 
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -158,6 +158,11 @@ case "$NGX_GCC_VER" in
         CFLAGS="$CFLAGS -Wno-unused-parameter"
         # 4.2.1 shows the warning in wrong places
         #CFLAGS="$CFLAGS -Wunreachable-code"
+
+        # deprecated system OpenSSL library on OS X
+        if [ "$NGX_SYSTEM" = "Darwin" ]; then
+            CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+        fi
     ;;
 
     *)
--- a/src/os/unix/ngx_darwin_config.h
+++ b/src/os/unix/ngx_darwin_config.h
@@ -9,9 +9,6 @@
 #define _NGX_DARWIN_CONFIG_H_INCLUDED_
 
 
-#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_0
-
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>