diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-07-25 17:51:34 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 17:51:34 -0700 |
| commit | 6914abab5f2d7fca0fc5f90915e539fd8a913a31 (patch) | |
| tree | 6fb3893cf365501b989945d0b57a82ff7deca0ce | |
| parent | 01da196879cb69b3c56b3bdcff6f0194ab5a190d (diff) | |
| parent | f7fbdd48752015cba7d1037d24eaaf2320e291fb (diff) | |
Merge pull request #7518 from nicolasnoble/plugins-should-compile
We should always try to compile the protoc plugins when building tests.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | templates/Makefile.template | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 |