diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-02-20 17:33:16 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-02-20 17:33:16 -0800 |
| commit | 6a88c2523a1e03286ec93c1174f2bcd577b59b1c (patch) | |
| tree | 3979e0daf77b148074ba90a1b82a0411c177966b | |
| parent | 16ffd653c78213d647157fbc84a1c88667a4795f (diff) | |
| parent | ec0430335d5a87026f6350548372cf768894ce96 (diff) | |
Merge pull request #690 from ctiller/mac2
Fix in tree build of openssl on mac
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | templates/Makefile.template | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -292,8 +292,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 diff --git a/templates/Makefile.template b/templates/Makefile.template index 32af0263fa..0ac901f69b 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 |