You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ch...@apache.org on 2019/01/07 23:10:57 UTC

[mesos] 03/04: Changed the gRPC make variables for protoc detection.

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

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

commit b7985e888fe4c7db4e7b46481bb39373be97f011
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Fri Jan 4 17:34:21 2019 -0800

    Changed the gRPC make variables for protoc detection.
    
    Since gRPC's Makefile use `HAS_XXX` as public-facing third-party
    library control flags, we should use them to detect protoc instead of
    setting the `NO_PROTOC` internal variable.
    
    Review: https://reviews.apache.org/r/69690
---
 3rdparty/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 650a40f..99270f0 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -496,7 +496,8 @@ $(GRPC)-build-stamp: $(GRPC)-stamp			\
 	    LDLIBS="$(LDLIBS)"				\
 	    HAS_PKG_CONFIG=false			\
 	    HAS_SYSTEM_CARES=false			\
-	    NO_PROTOC=false				\
+	    HAS_PROTOC=true				\
+	    HAS_VALID_PROTOC=true			\
 	    PROTOC="$(PROTOC)"
 	touch $@