Files
Alexander J. Semenuk 5d5e35fb9b fix: Windows toolchain compatibility (curl 8.21 re-vendor, endless reconfigure loop) (#4355)
## Problem

Windows builds break with a current local toolchain (Scoop LLVM 22.1.8,
CMake 4.4.0, VS 2026), in two independent ways:

1. The build stops at curl's deliberate guard: `#error "no non-blocking
method was found/used/set"` in `third-party/curl/lib/nonblock.c`.
2. From the second configure onward, `cmake --build` re-runs CMake in an
endless loop (observed 42 consecutive reconfigure cycles in a single
build). Likely the same mechanism behind the "endlessly building" VS
2026 note in `docs/setup/dev/vs.md`.

## Root cause

1. `third-party/curl/CMake/CurlTests.c` passes `int *` to
`ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes
`-Wincompatible-pointer-types` to a hard error in C, so the
`HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and
`curl_config.h` never defines it. Upstream CI does not see this because
the windows-2022 runner image ships an older LLVM. GCC 14 promotes the
same warning to a hard error, which is very likely the `CurlTests.c.obj`
failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl
hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0
(curl/curl#13578).
2. The root CMakeLists copies the build tree's `compile_commands.json`
into `<src>/build/` for clangd using `configure_file()`, which registers
its input as a configure dependency. CMake rewrites
`compile_commands.json` late in every generation, after
`CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same
Ninja regen rule), so once the dependency is registered the rule is
deterministically dirty and every `ninja` invocation re-runs CMake. A
pristine first configure is safe (the file does not exist yet, so the
`if(EXISTS ...)` guard skips the copy), which is why the loop looks
machine- or IDE-specific.

## Fix

1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag
(previously `curl-8_3_0`), which carries the upstream probe fix plus two
years of upstream development; `vendor.yaml` updated to match.
Adjustments the version jump forced:
- curl 8.15 removed the native macOS Secure Transport backend
(`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like
Linux. The two macOS workflows install Homebrew `openssl@3` and export
`OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same
two lines.
- `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10;
pinned OFF to keep the previous no-compression behavior and avoid
silently linking whatever the CI images happen to have.
- curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked
into discord-rpc's identically named option and broke configure at a
nonexistent `examples/send-presence` directory; pinned OFF ahead of the
third-party subdirectories.

The diff is dominated by the mechanical tag-tree swap under
`third-party/curl` (linguist-vendored, collapsed in review). The
hand-written changes are `CMakeLists.txt`, the two macOS workflows,
`docs/setup/system/macos.md`, and `vendor.yaml`.
2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy
with no configure dependency registered. (`file(COPY_FILE ...
ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21,
above the declared `cmake_minimum_required(VERSION 3.10)`.)

## Test plan

- [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache
seeding) completes and logs `Enabled SSL backends: Schannel`; the
FIONBIO probe passes without the previous `#error`
- [x] Full Windows Release build from scratch in the branch worktree
(all 1422 targets)
- [x] goalc-test suite: 1509 passed, 0 failed
- [x] Second consecutive configure with `compile_commands.json` present:
the regen rule in `build.ninja` has no `compile_commands.json` input;
`<src>/build/compile_commands.json` is still refreshed for clangd
- [x] Repeated `ninja` invocations after a full build no longer re-run
CMake
- [x] macOS Intel and ARM CI green (first exercise of the OpenSSL
backend switch)

---

I work off a self-hosted forge, so this GitHub account is quiet; the
configure logs and ninja dirty-node traces from the investigation are
available if anyone wants the raw data.

(AI-assisted)
2026-07-27 19:19:18 -04:00

163 lines
5.6 KiB
C
Vendored
Generated

/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "unitcheck.h"
#include "curlx/wait.h"
#include "thrdpool.h"
#ifdef USE_THREADS
struct unit3300_ctx {
uint32_t total;
uint32_t taken;
uint32_t returned;
};
static uint32_t unit3300_item = 23;
static uint32_t unit3300_delay_ms = 0;
static void unit3300_ctx_init(struct unit3300_ctx *ctx,
uint32_t total,
uint32_t delay_ms)
{
memset(ctx, 0, sizeof(*ctx));
ctx->total = total;
unit3300_delay_ms = delay_ms;
}
static void *unit3300_take(void *user_data, const char **pdescription,
timediff_t *ptimeout_ms)
{
struct unit3300_ctx *ctx = user_data;
*pdescription = NULL;
*ptimeout_ms = 0;
if(ctx->taken < ctx->total) {
ctx->taken++;
return &unit3300_item;
}
return NULL;
}
static void unit3300_process(void *item)
{
fail_unless(item == &unit3300_item, "process unexpected item");
if(unit3300_delay_ms) {
curlx_wait_ms(unit3300_delay_ms);
}
}
static void unit3300_return(void *item, void *user_data)
{
struct unit3300_ctx *ctx = user_data;
(void)item;
if(ctx) {
ctx->returned++;
fail_unless(ctx->returned <= ctx->total, "returned too many");
}
}
static CURLcode test_unit3300(const char *arg)
{
UNITTEST_BEGIN_SIMPLE
struct curl_thrdpool *tpool;
struct unit3300_ctx ctx;
CURLcode result;
/* pool without minimum, does not start anything */
unit3300_ctx_init(&ctx, 10, 0);
result = Curl_thrdpool_create(&tpool, "unit3300a", 0, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-a create");
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(!ctx.returned, "pool-a unexpected items returned");
fail_unless(!ctx.taken, "pool-a unexpected items taken");
/* pool without minimum, signal start, consumes everything */
unit3300_ctx_init(&ctx, 10, 0);
result = Curl_thrdpool_create(&tpool, "unit3300b", 0, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-b create");
result = Curl_thrdpool_signal(tpool, 2);
fail_unless(!result, "pool-b signal");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-b items returned missing");
fail_unless(ctx.taken == ctx.total, "pool-b items taken missing");
/* pool with minimum, consumes everything without signal */
unit3300_ctx_init(&ctx, 10, 0);
result = Curl_thrdpool_create(&tpool, "unit3300c", 1, 2, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-c create");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-c items returned missing");
fail_unless(ctx.taken == ctx.total, "pool-c items taken missing");
/* pool with many max, signal abundance, consumes everything */
unit3300_ctx_init(&ctx, 100, 0);
result = Curl_thrdpool_create(&tpool, "unit3300d", 0, 50, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-d create");
result = Curl_thrdpool_signal(tpool, 100);
fail_unless(!result, "pool-d signal");
Curl_thrdpool_await_idle(tpool, 0);
Curl_thrdpool_destroy(tpool, TRUE);
fail_unless(ctx.returned == ctx.total, "pool-d items returned missing");
fail_unless(ctx.taken == ctx.total, "pool-d items taken missing");
/* pool with 1 max, many to take, no await, destroy without join */
unit3300_ctx_init(&ctx, 10000000, 1);
result = Curl_thrdpool_create(&tpool, "unit3300e", 0, 1, 0,
unit3300_take, unit3300_process,
unit3300_return, &ctx);
fail_unless(!result, "pool-e create");
result = Curl_thrdpool_signal(tpool, 100);
fail_unless(!result, "pool-e signal");
Curl_thrdpool_destroy(tpool, FALSE);
fail_unless(ctx.returned < ctx.total, "pool-e returned all");
fail_unless(ctx.taken < ctx.total, "pool-e took all");
#ifdef DEBUGBUILD
/* pool thread notices destruction and should immediately abort.
* No memory leak should be reported. if the wait is too short on
* a slow system, thread sanitizer freaks out as memdebug
* is called by threads after main thread shut down. */
curlx_wait_ms(1000);
#endif
UNITTEST_END_SIMPLE
}
#else
static CURLcode test_unit3300(const char *arg)
{
UNITTEST_BEGIN_SIMPLE
UNITTEST_END_SIMPLE
}
#endif /* USE_THREADS */