diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-09 12:29:17 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-09 12:29:17 -0800 |
| commit | 1298afd10e5ac6bdf2a80a86d363954910407af5 (patch) | |
| tree | d6a3fe7aa6e0c6dc4bf646731857f7575ca7f6f3 /templates | |
| parent | b0154c4d546ae6383365e753c1b786ac7b23c912 (diff) | |
Get compilation working again
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 7aa463f58c..e76a2fdb46 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1478,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) \ @@ -1489,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) \ @@ -1526,6 +1528,7 @@ mingw_lib_deps = mingw_lib_deps + ' ' + lib_archive else: for dep in lib.get('deps', []): + if dep == 'gpr': continue libs = libs + ' -l' + dep lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT)' mingw_libs = mingw_libs + ' -l' + dep + '-imp' @@ -1535,6 +1538,8 @@ if security == True: common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)' common = common + ' $(ZLIB_MERGE_LIBS)' + lib_deps += ' $(LIBDIR)/$(CONFIG)/libgpr.a' + common += ' $(LIBDIR)/$(CONFIG)/libgpr.a' if security in [True, 'check']: for src in lib.src: |