@@ -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
@@ -1622,10 +1627,19 @@ else
16221627 CURL_LIBCURL =
16231628 endif
16241629
1625- ifndef CURL_LDFLAGS
1626- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1630+ ifdef LAZYLOAD_LIBCURL
1631+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1632+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1633+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1634+ # declared as DLL imports
1635+ CURL_CFLAGS = -DCURL_STATICLIB
1636+ CURL_LIBCURL = -ldl
1637+ else
1638+ ifndef CURL_LDFLAGS
1639+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1640+ endif
1641+ CURL_LIBCURL += $(CURL_LDFLAGS)
16271642 endif
1628- CURL_LIBCURL += $(CURL_LDFLAGS)
16291643
16301644 ifndef CURL_CFLAGS
16311645 CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1646,7 +1660,7 @@ else
16461660 endif
16471661 ifdef USE_CURL_FOR_IMAP_SEND
16481662 BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1649- IMAP_SEND_BUILDDEPS = http.o
1663+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16501664 IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16511665 endif
16521666 ifndef NO_EXPAT
@@ -2818,10 +2832,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
28182832 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28192833 $(IMAP_SEND_LDFLAGS ) $(LIBS )
28202834
2821- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2835+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28222836 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28232837 $(CURL_LIBCURL ) $(LIBS )
2824- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2838+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28252839 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28262840 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28272841
@@ -2831,7 +2845,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28312845 ln -s $< $@ 2> /dev/null || \
28322846 cp $< $@
28332847
2834- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2848+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28352849 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28362850 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28372851
0 commit comments