From: Viktor Szakats <commit@vsz.me>
Date: Sun, 11 Oct 2020 19:30:45 +0000 (+0000)
Subject: src/Makefile.m32: fix undefined curlx_dyn_* errors
X-Git-Tag: curl-7_73_0~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8ca70547472b9af29e6deb426d46afb2c58ae99;p=thirdparty%2Fcurl.git

src/Makefile.m32: fix undefined curlx_dyn_* errors

by linking `lib/dynbuf.c` when building a static curl binary.
Previously this source file was only included when building
a dynamic curl binary. This was likely possibly because no
functions from the `src/Makefile.inc` / `CURLX_CFILES` sources
were actually required for a curl tool build. This has
recently changed with the introduction of `curlx_dyn_*()`
memory functions and their use by the tool sources.

Closes #6060
---

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 74e7b93d7a..b3fcae5cf7 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -380,10 +380,8 @@ include Makefile.inc
 curl_PROGRAMS = curl.exe
 curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_CFILES)))
 curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_CFILES))))
-ifdef DYN
 curl_OBJECTS += $(curlx_OBJECTS)
 vpath %.c $(PROOT)/lib
-endif
 
 RESOURCE = curl.res