@@ -464,6 +464,11 @@ include shared.mak
464464#
465465# CURL_LDFLAGS=-lcurl
466466#
467+ # Define LAZYLOAD_LIBCURL to dynamically load the libcurl; This can be useful
468+ # if Multiple libcurl versions exist (with different file names) that link to
469+ # various SSL/TLS backends, to support the `http.sslBackend` runtime switch in
470+ # such a scenario.
471+ #
467472# === Optional library: libpcre2 ===
468473#
469474# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1616,10 +1621,19 @@ else
16161621 CURL_LIBCURL =
16171622 endif
16181623
1619- ifndef CURL_LDFLAGS
1620- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1624+ ifdef LAZYLOAD_LIBCURL
1625+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1626+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1627+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1628+ # declared as DLL imports
1629+ CURL_CFLAGS = -DCURL_STATICLIB
1630+ CURL_LIBCURL = -ldl
1631+ else
1632+ ifndef CURL_LDFLAGS
1633+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1634+ endif
1635+ CURL_LIBCURL += $(CURL_LDFLAGS)
16211636 endif
1622- CURL_LIBCURL += $(CURL_LDFLAGS)
16231637
16241638 ifndef CURL_CFLAGS
16251639 CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1640,7 +1654,7 @@ else
16401654 endif
16411655 ifdef USE_CURL_FOR_IMAP_SEND
16421656 BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1643- IMAP_SEND_BUILDDEPS = http.o
1657+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16441658 IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16451659 endif
16461660 ifndef NO_EXPAT
@@ -2812,10 +2826,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
28122826 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28132827 $(IMAP_SEND_LDFLAGS ) $(LIBS )
28142828
2815- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2829+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28162830 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28172831 $(CURL_LIBCURL ) $(LIBS )
2818- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2832+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28192833 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28202834 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28212835
@@ -2825,7 +2839,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28252839 ln -s $< $@ 2> /dev/null || \
28262840 cp $< $@
28272841
2828- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2842+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28292843 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28302844 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28312845
0 commit comments