]> git.kaiwu.me - nginx.git/commitdiff
Configure: added -Wno-deprecated-declarations on OS X.
authorMaxim Dounin <mdounin@mdounin.ru>
Wed, 28 May 2014 13:41:44 +0000 (17:41 +0400)
committerMaxim Dounin <mdounin@mdounin.ru>
Wed, 28 May 2014 13:41:44 +0000 (17:41 +0400)
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).

auto/cc/clang
auto/cc/gcc
src/os/unix/ngx_darwin_config.h

index baaf4baa23aeceddf28cae30bf21aa73dbad3607..25707b42db29c73cd9a3303500f3b9f9a7a39deb 100644 (file)
@@ -88,6 +88,11 @@ CFLAGS="$CFLAGS -Wconditional-uninitialized"
 # 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"
 
index c27d857e3ecef5e833ffe5c5b9c5cf72012f3806..727f11e1dfce8d36f52e00103bca61f6e0b1eb1d 100644 (file)
@@ -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
     ;;
 
     *)
index 7ac86c73e82a2e8af5d5aeb6ead37226df729914..bbad977cb6cb9125dca473002b293b5cd514c667 100644 (file)
@@ -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>