This is an automated email from the ASF dual-hosted git repository.

chhsiao pushed a commit to branch 1.6.x
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/1.6.x by this push:
     new 6df51c9  Disabled warnings-as-errors for gRPC build.
6df51c9 is described below

commit 6df51c952e4a227577a8be136737f67fe100bd31
Author: Benno Evers <bev...@mesosphere.com>
AuthorDate: Wed Oct 17 22:46:54 2018 +0200

    Disabled warnings-as-errors for gRPC build.
---
 3rdparty/Makefile.am | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 8d9fa85..8462cf9 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -329,24 +329,19 @@ LIB_GRPC = $(GRPC)/libs/opt/libgrpc++.a                   
\
 
 $(LIB_GRPC): $(GRPC)-build-stamp
 
-# NOTE: The `-Wno-deprecated-declarations` flag is added so that gRPC
-# can be built with OpenSSL 1.1.0. See:
-# https://github.com/grpc/grpc/pull/11496
-# NOTE: The `-Wno-unused-function` flag is added to address errors when
-# compling `src/core/tsi/ssl_transport_security.cc`. See:
-# https://github.com/grpc/grpc/pull/11675
+# We use EXTRA_CPPFLAGS to pass `-Wno-error`, because that one needs to be
+# appended and not prepended to the constructed flags.
 $(GRPC)-build-stamp: $(GRPC)-stamp                     \
                      $(PROTOBUF)-build-stamp
        cd $(GRPC) &&                                   \
-         CPPFLAGS="-Wno-deprecated-declarations        \
-                   -Wno-unused-function                \
-                   $(PROTOBUF_INCLUDE_FLAGS)           \
+         CPPFLAGS="$(PROTOBUF_INCLUDE_FLAGS)           \
                    $(SSL_INCLUDE_FLAGS)                \
                    $(ZLIB_INCLUDE_FLAGS)"              \
          LDFLAGS="$(PROTOBUF_LINKER_FLAGS)             \
                   $(SSL_LINKER_FLAGS)                  \
                   $(ZLIB_LINKER_FLAGS)"                \
          $(MAKE) $(AM_MAKEFLAGS)                       \
+                 EXTRA_CPPFLAGS=-Wno-error             \
                  HAS_PKG_CONFIG=false                  \
                  NO_PROTOC=false                       \
                  PROTOC=$(PROTOC)

Reply via email to