From 945b41312cba1345c05f4f9b2b4727986dd96638 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 2 Jun 2015 20:13:40 +0200 Subject: Swapping the library order so that anything that openssl requires is properly tagged afterward. --- templates/Makefile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/Makefile.template b/templates/Makefile.template index bc8f1bb1d0..38adb2f6c8 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1220,7 +1220,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: -- cgit v1.2.3 From 3adab74c629b8f56f0c04f5e0cc234f1cf3fcb06 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 2 Jun 2015 00:33:06 +0200 Subject: Avoid polluting our compilation with previously installed grpc. --- Makefile | 2 ++ templates/Makefile.template | 2 ++ 2 files changed, 4 insertions(+) (limited to 'templates') diff --git a/Makefile b/Makefile index dfdce1d83d..644691969e 100644 --- a/Makefile +++ b/Makefile @@ -262,6 +262,8 @@ LDFLAGS += -fPIC endif INCLUDES = . include $(GENDIR) +LDFLAGS += -Llibs/$(CONFIG) + ifeq ($(SYSTEM),Darwin) ifneq ($(wildcard /usr/local/ssl/include),) INCLUDES += /usr/local/ssl/include diff --git a/templates/Makefile.template b/templates/Makefile.template index bc8f1bb1d0..1422150d0d 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 -- cgit v1.2.3