diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-05-28 17:41:44 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-05-28 17:41:44 +0400 |
| commit | e9a70114a2b91a5d60f6205739d4207575e8495c (patch) | |
| tree | 6a8875293be0213a9c593b8069ad61c098e0c7e3 | |
| parent | ffe21776fa676d5d56ed3d6f263e09f89f5d7fd5 (diff) | |
| download | nginx-e9a70114a2b91a5d60f6205739d4207575e8495c.tar.gz nginx-e9a70114a2b91a5d60f6205739d4207575e8495c.tar.bz2 | |
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).
| -rw-r--r-- | auto/cc/clang | 5 | ||||
| -rw-r--r-- | auto/cc/gcc | 5 | ||||
| -rw-r--r-- | src/os/unix/ngx_darwin_config.h | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/auto/cc/clang b/auto/cc/clang index baaf4baa2..25707b42d 100644 --- a/auto/cc/clang +++ b/auto/cc/clang @@ -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" diff --git a/auto/cc/gcc b/auto/cc/gcc index c27d857e3..727f11e1d 100644 --- 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 ;; *) diff --git a/src/os/unix/ngx_darwin_config.h b/src/os/unix/ngx_darwin_config.h index 7ac86c73e..bbad977cb 100644 --- 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> |