From f7fbdd48752015cba7d1037d24eaaf2320e291fb Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org> Date: Mon, 25 Jul 2016 20:31:22 +0200 Subject: [PATCH] We should always try to compile the protoc plugins when building tests. --- Makefile | 2 +- templates/Makefile.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 80e8d7434b..00ec4421f3 100644 --- a/Makefile +++ b/Makefile @@ -748,8 +748,8 @@ endif endif else PC_LIBS_GRPCXX = -lprotobuf -PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL) endif +PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL) else ifeq ($(HAS_EMBEDDED_PROTOBUF),true) PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a diff --git a/templates/Makefile.template b/templates/Makefile.template index cb33643dd2..9afc6566e2 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -642,8 +642,8 @@ endif else PC_LIBS_GRPCXX = -lprotobuf - PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL) endif + PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL) else ifeq ($(HAS_EMBEDDED_PROTOBUF),true) PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a -- GitLab