diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-27 19:50:56 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-27 19:50:56 +0200 |
| commit | 64f8d09ca0f4e4d2172c07c58df39254292a23ce (patch) | |
| tree | 04fd09302712640913c48b618e94a788a5978168 /Makefile | |
| parent | bc0b08892f2739f999529850e6fdd9600740b31d (diff) | |
| parent | 818564cc2b9453b4b093f417f3c5c6cb4d07ad7e (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 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 |