Merge pull request #7518 from nicolasnoble/plugins-should-compile

We should always try to compile the protoc plugins when building tests.
9 years ago · 6914abab5f
parent 01da196879 f7fbdd4875
commit 6914abab5f
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -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
--- 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