]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
Makefile.mk: always set `CURL_STATICLIB` for lib (Windows)
authorViktor Szakats <commit@vsz.me>
Fri, 22 Sep 2023 18:52:46 +0000 (18:52 +0000)
committerViktor Szakats <commit@vsz.me>
Sat, 23 Sep 2023 20:42:47 +0000 (20:42 +0000)
Also fix to export all symbols in Windows debug builds, making
`-debug-dyn` builds work with `-DCURL_STATICLIB` set.

Ref: https://github.com/curl/curl/pull/11914 (same for CMake)

Closes #11924

lib/Makefile.mk

index e1f782bac8f331fd8943ede9b517009bf6a82bb7..5071600b59d5da293b1ef5f94e43c31f7caf4ddb 100644 (file)
@@ -375,6 +375,9 @@ distclean vclean: clean
 ifdef LOCAL
 
 CPPFLAGS += -DBUILDING_LIBCURL
+ifdef WIN32
+CPPFLAGS += -DCURL_STATICLIB
+endif
 
 ### Sources and targets
 
@@ -388,7 +391,9 @@ ifdef WIN32
 CURL_DLL_SUFFIX ?=
 libcurl_dll_LIBRARY := libcurl$(CURL_DLL_SUFFIX).dll
 libcurl_dll_a_LIBRARY := libcurl.dll.a
+ifeq ($(findstring -trackmem,$(CFG)),)
 CURL_LDFLAGS_LIB += $(PROOT)/libcurl.def
+endif
 ifdef MAP
 libcurl_map_LIBRARY := libcurl$(CURL_DLL_SUFFIX).map
 CURL_LDFLAGS_LIB += -Wl,-Map,$(libcurl_map_LIBRARY)