From: Viktor Szakats <commit@vsz.me>
Date: Wed, 6 Jul 2022 09:22:42 +0000 (+0000)
Subject: Makefile.m32: add `NGTCP2_LIBS` option [ci skip]
X-Git-Tag: curl-7_85_0~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=190caa9ce278317399fa8ec7db39c1249cf952cb;p=thirdparty%2Fcurl.git

Makefile.m32: add `NGTCP2_LIBS` option [ci skip]

Makefile.m32's ngtcp2 has its two libs hardwired for OpenSSL.
Add `NGTCP2_LIBS` envvar to override them with a custom list,
making it possible to use BoringSSL, or any other backend.

Closes #9109
---

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 6ff03a6a1a..3a98b66bd7 100644
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -278,7 +278,12 @@ ifdef SSL
     curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
     ifdef NGTCP2
       CFLAGS += -DUSE_NGTCP2
-      curl_LDADD += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+      curl_LDADD += -L"$(NGTCP2_PATH)/lib"
+      ifdef NGTCP2_LIBS
+        curl_LDADD += $(NGTCP2_LIBS)
+      else
+        curl_LDADD += -lngtcp2 -lngtcp2_crypto_openssl
+      endif
     endif
   endif
 
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3311a89eab..8cc72dae52 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -293,7 +293,12 @@ ifdef SSL
     ifdef NGTCP2
       INCLUDES += -I"$(NGTCP2_PATH)/include"
       CFLAGS += -DUSE_NGTCP2
-      DLL_LIBS += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+      DLL_LIBS += -L"$(NGTCP2_PATH)/lib"
+      ifdef NGTCP2_LIBS
+        DLL_LIBS += $(NGTCP2_LIBS)
+      else
+        DLL_LIBS += -lngtcp2 -lngtcp2_crypto_openssl
+      endif
     endif
   endif
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 8d57debec8..b202bf0879 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -303,7 +303,12 @@ ifdef SSL
     curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
     ifdef NGTCP2
       CFLAGS += -DUSE_NGTCP2
-      curl_LDADD += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl
+      curl_LDADD += -L"$(NGTCP2_PATH)/lib"
+      ifdef NGTCP2_LIBS
+        curl_LDADD += $(NGTCP2_LIBS)
+      else
+        curl_LDADD += -lngtcp2 -lngtcp2_crypto_openssl
+      endif
     endif
   endif