@@ -471,6 +471,11 @@ include shared.mak
471
471
#
472
472
# CURL_LDFLAGS=-lcurl
473
473
#
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
+ #
474
479
# === Optional library: libpcre2 ===
475
480
#
476
481
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1647,10 +1652,19 @@ else
1647
1652
CURL_LIBCURL =
1648
1653
endif
1649
1654
1650
- ifndef CURL_LDFLAGS
1651
- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1655
+ ifdef LAZYLOAD_LIBCURL
1656
+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1657
+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1658
+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1659
+ # declared as DLL imports
1660
+ CURL_CFLAGS = -DCURL_STATICLIB
1661
+ CURL_LIBCURL = -ldl
1662
+ else
1663
+ ifndef CURL_LDFLAGS
1664
+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1665
+ endif
1666
+ CURL_LIBCURL += $(CURL_LDFLAGS)
1652
1667
endif
1653
- CURL_LIBCURL += $(CURL_LDFLAGS)
1654
1668
1655
1669
ifndef CURL_CFLAGS
1656
1670
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1671,7 +1685,7 @@ else
1671
1685
endif
1672
1686
ifdef USE_CURL_FOR_IMAP_SEND
1673
1687
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1674
- IMAP_SEND_BUILDDEPS = http.o
1688
+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
1675
1689
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
1676
1690
endif
1677
1691
ifndef NO_EXPAT
@@ -2849,10 +2863,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
2849
2863
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2850
2864
$(IMAP_SEND_LDFLAGS ) $(LIBS )
2851
2865
2852
- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2866
+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2853
2867
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2854
2868
$(CURL_LIBCURL ) $(LIBS )
2855
- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2869
+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2856
2870
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2857
2871
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2858
2872
@@ -2862,7 +2876,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
2862
2876
ln -s $< $@ 2> /dev/null || \
2863
2877
cp $< $@
2864
2878
2865
- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2879
+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2866
2880
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2867
2881
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2868
2882
0 commit comments