diff --git a/Makefile b/Makefile index 5af091d33460541c957addb32b46e4aaccbe31dd..a8d81f725baa720120afa98d4fa9c3fb810876e3 100644 --- a/Makefile +++ b/Makefile @@ -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 32af0263fa12fbae71e653cbefb3013893a8e56a..0ac901f69bc1c8b002d10fb7b378eae1aeef149b 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