diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-20 17:24:41 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-20 17:24:41 -0800 |
| commit | ec0430335d5a87026f6350548372cf768894ce96 (patch) | |
| tree | 9658f64ac4d9551d1f04d83a42042474be7c5d90 /templates | |
| parent | f6b04156aa381d819ee9b47ebcbcac5b081c284c (diff) | |
Fix in tree build of openssl on mac
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 85da0dd892..488c0de89a 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -309,8 +309,9 @@ ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),false) ifeq ($(HAS_EMBEDDED_OPENSSL_ALPN),true) OPENSSL_DEP = $(LIBDIR)/$(CONFIG)/openssl/libssl.a OPENSSL_MERGE_LIBS += $(LIBDIR)/$(CONFIG)/openssl/libssl.a $(LIBDIR)/$(CONFIG)/openssl/libcrypto.a -CPPFLAGS += -Ithird_party/openssl/include -LDFLAGS += -L$(LIBDIR)/$(CONFIG)/openssl +# need to prefix these to ensure overriding system libraries +CPPFLAGS := -Ithird_party/openssl/include $(CPPFLAGS) +LDFLAGS := -L$(LIBDIR)/$(CONFIG)/openssl $(LDFLAGS) LIBS_SECURE = dl else NO_SECURE = true |