@@ -471,6 +471,11 @@ include shared.mak
471471#
472472# CURL_LDFLAGS=-lcurl
473473#
474+ # Define LAZYLOAD_LIBCURL to dynamically load the libcurl; This can be useful
475+ # if Multiple libcurl versions exist (with different file names) that link to
476+ # various SSL/TLS backends, to support the `http.sslBackend` runtime switch in
477+ # such a scenario.
478+ #
474479# === Optional library: libpcre2 ===
475480#
476481# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1635,10 +1640,19 @@ else
16351640 CURL_LIBCURL =
16361641 endif
16371642
1638- ifndef CURL_LDFLAGS
1639- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1643+ ifdef LAZYLOAD_LIBCURL
1644+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1645+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1646+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1647+ # declared as DLL imports
1648+ CURL_CFLAGS = -DCURL_STATICLIB
1649+ CURL_LIBCURL = -ldl
1650+ else
1651+ ifndef CURL_LDFLAGS
1652+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1653+ endif
1654+ CURL_LIBCURL += $(CURL_LDFLAGS)
16401655 endif
1641- CURL_LIBCURL += $(CURL_LDFLAGS)
16421656
16431657 ifndef CURL_CFLAGS
16441658 CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1659,7 +1673,7 @@ else
16591673 endif
16601674 ifdef USE_CURL_FOR_IMAP_SEND
16611675 BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1662- IMAP_SEND_BUILDDEPS = http.o
1676+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16631677 IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16641678 endif
16651679 ifndef NO_EXPAT
@@ -2845,10 +2859,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
28452859 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28462860 $(IMAP_SEND_LDFLAGS ) $(LIBS )
28472861
2848- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2862+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28492863 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28502864 $(CURL_LIBCURL ) $(LIBS )
2851- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2865+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28522866 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28532867 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28542868
@@ -2858,7 +2872,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28582872 ln -s $< $@ 2> /dev/null || \
28592873 cp $< $@
28602874
2861- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2875+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
28622876 $(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
28632877 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
28642878
0 commit comments