]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
Makefile.m32: add `NGTCP2_LIBS` option [ci skip]
authorViktor Szakats <commit@vsz.me>
Wed, 6 Jul 2022 09:22:42 +0000 (09:22 +0000)
committerViktor Szakats <commit@vsz.me>
Wed, 6 Jul 2022 09:22:42 +0000 (09:22 +0000)
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

docs/examples/Makefile.m32
lib/Makefile.m32
src/Makefile.m32

index 6ff03a6a1a1433cffdae194489c6148fdde1ee75..3a98b66bd7fd59ec0484150afeae2cab5fd363c3 100644 (file)
@@ -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
 
index 3311a89eab9466add46525c863ce79ab0db15242..8cc72dae5279e0a26e76d6b9e9e98276c61d7518 100644 (file)
@@ -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
 
index 8d57debec8401320d6b52b04f654d20b934661cd..b202bf087908588f42e2006e75ef390152bd37ff 100644 (file)
@@ -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