From f9ff59ebe2aa8d7752270a2c541e48e8a91e6963 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 17 Jul 2022 21:45:34 +0000 Subject: [PATCH] Makefile.m32: stop trying to build libcares.a [ci skip] Before this patch, `lib/Makefile.m32` had a rule to build `libcares.a` in `-cares`-enabled builds, via c-ares's own `Makefile.m32`. Committed in 2007 [1]. The commit message doesn't specifically address this particular change. This logic comes from the times when c-ares was part of the curl source tree, hence the special treatment. This feature creates problems when building c-ares first, using CMake and pointing `LIBCARES_PATH` to its install prefix, where `Makefile.m32` is missing in such case. A sub-build for c-ares is undesired also when c-ares had already been build via its own `Makefile.m32`. To avoid the sub-build, this patch deletes its Makefile rule. After this patch `libcares.a` needs to be manually built before using it in `Makefile.m32`. Aligning it with the rest of dependencies. [1] 46c92c0b806da041d7a5c6fb64dbcdc474d99b31 Reviewed-by: Daniel Stenberg Closes #9169 --- lib/Makefile.m32 | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 7166c1b5dc..e8c9682a63 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -459,6 +459,3 @@ clean: distclean vclean: clean @$(call DEL, $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_LIBRARY:.dll=.def) $(libcurl_dll_a_LIBRARY)) - -$(LIBCARES_PATH)/libcares.a: - $(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32 -- 2.47.3