diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:28:36 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:28:36 -0700 |
| commit | 8cc6f42287b863bc18a6d7ab64faf0e0831880b9 (patch) | |
| tree | 39ea776c5671d61c0a5d9bc31267389b7a8bc566 /templates | |
| parent | 4b678bd7227952da8d3a690db64baf0ff1af1d2f (diff) | |
| parent | 67a3c164f541eb829dfabbdcbddd0e99c9811dc2 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 099a722873..c155b20a72 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -276,6 +276,8 @@ LDFLAGS += -fPIC endif INCLUDES = . include $(GENDIR) +LDFLAGS += -Llibs/$(CONFIG) + ifeq ($(SYSTEM),Darwin) ifneq ($(wildcard /usr/local/ssl/include),) INCLUDES += /usr/local/ssl/include @@ -1220,7 +1222,7 @@ endif mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '.$(SHARED_EXT)' if lib.get('secure', 'check') == 'yes': - common = common + ' $(LDLIBS_SECURE) $(OPENSSL_MERGE_LIBS)' + common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)' for src in lib.src: sources_that_need_openssl.add(src) else: |