diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-10 17:39:45 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-10 17:39:45 -0800 |
| commit | 9c7961a01408d3228dec55a9f39a15129f57b3ed (patch) | |
| tree | 192947555187a17c69e01576ec654114c2fa6f96 /templates/Makefile.template | |
| parent | 6d74725b052aefd0cfc5bdccc880da882f8d7cc8 (diff) | |
| parent | ad09598ae5ae01d3b3d431538dddbc096afb54ef (diff) | |
Merge pull request #5165 from ctiller/bring_back_gpr
Bring back gpr
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 9942514211..218f492837 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -551,26 +551,20 @@ # grpc .pc file PC_NAME = gRPC - PC_DESCRIPTION = High performance general RPC framework - PC_CFLAGS = -pthread - PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE) -lpthread + PC_DESCRIPTION = high performance general RPC framework + PC_CFLAGS = + PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE) PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE) PC_LIB = -lgrpc - ifneq ($(SYSTEM),Darwin) - PC_LIBS_PRIVATE += -lrt - endif GRPC_PC_FILE := $(PC_TEMPLATE) - # gprc_unsecure .pc file + # grpc_unsecure .pc file PC_NAME = gRPC unsecure - PC_DESCRIPTION = High performance general RPC framework without SSL - PC_CFLAGS = -pthread - PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) -lpthread + PC_DESCRIPTION = high performance general RPC framework without SSL + PC_CFLAGS = + PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) PC_LIB = -lgrpc - ifneq ($(SYSTEM),Darwin) - PC_LIBS_PRIVATE += -lrt - endif GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE) # grpc_zookeeper .pc file @@ -1484,6 +1478,7 @@ % endif $(LIB${lib.name.upper()}_OBJS) \ % if lib.get('baselib', False): + $(LIBGPR_OBJS) \ $(ZLIB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ @@ -1495,6 +1490,7 @@ $(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(Q) $(AR) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) \ % if lib.get('baselib', False): + $(LIBGPR_OBJS) \ $(ZLIB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ |