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

254 lines
6.9 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 "curl_setup.h"
#include "uint-bset.h"
#include "uint-spbset.h"
#ifdef DEBUGBUILD
#define CURL_UINT32_SPBSET_MAGIC 0x70737362
#endif
void Curl_uint32_spbset_init(struct uint32_spbset *bset)
{
memset(bset, 0, sizeof(*bset));
#ifdef DEBUGBUILD
bset->init = CURL_UINT32_SPBSET_MAGIC;
#endif
}
/* Clear the bitset, making it empty.
@unittest 3213
*/
UNITTEST void uint32_spbset_clear(struct uint32_spbset *bset);
UNITTEST void uint32_spbset_clear(struct uint32_spbset *bset)
{
struct uint32_spbset_chunk *next, *chunk;
for(chunk = bset->head.next; chunk; chunk = next) {
next = chunk->next;
curlx_free(chunk);
}
memset(&bset->head, 0, sizeof(bset->head));
}
void Curl_uint32_spbset_destroy(struct uint32_spbset *bset)
{
DEBUGASSERT(bset->init == CURL_UINT32_SPBSET_MAGIC);
uint32_spbset_clear(bset);
}
uint32_t Curl_uint32_spbset_count(struct uint32_spbset *bset)
{
struct uint32_spbset_chunk *chunk;
uint32_t i, n = 0;
for(chunk = &bset->head; chunk; chunk = chunk->next) {
for(i = 0; i < CURL_UINT32_SPBSET_CH_SLOTS; ++i) {
if(chunk->slots[i])
n += CURL_POPCOUNT64(chunk->slots[i]);
}
}
return n;
}
static struct uint32_spbset_chunk *uint32_spbset_get_chunk(
struct uint32_spbset *bset, uint32_t i, bool grow)
{
struct uint32_spbset_chunk *chunk, **panchor = NULL;
uint32_t i_offset = (i & ~CURL_UINT32_SPBSET_CH_MASK);
if(!bset)
return NULL;
for(chunk = &bset->head; chunk;
panchor = &chunk->next, chunk = chunk->next) {
if(chunk->offset == i_offset) {
return chunk;
}
else if(chunk->offset > i_offset) {
/* need new chunk here */
chunk = NULL;
break;
}
}
if(!grow)
return NULL;
/* need a new one */
chunk = curlx_calloc(1, sizeof(*chunk));
if(!chunk)
return NULL;
if(panchor) { /* insert between panchor and *panchor */
chunk->next = *panchor;
*panchor = chunk;
}
else { /* prepend to head, switching places */
memcpy(chunk, &bset->head, sizeof(*chunk));
memset(&bset->head, 0, sizeof(bset->head));
bset->head.next = chunk;
}
chunk->offset = i_offset;
return chunk;
}
bool Curl_uint32_spbset_add(struct uint32_spbset *bset, uint32_t i)
{
struct uint32_spbset_chunk *chunk;
uint32_t i_chunk;
chunk = uint32_spbset_get_chunk(bset, i, TRUE);
if(!chunk)
return FALSE;
DEBUGASSERT(i >= chunk->offset);
i_chunk = (i - chunk->offset);
DEBUGASSERT((i_chunk / 64) < CURL_UINT32_SPBSET_CH_SLOTS);
chunk->slots[(i_chunk / 64)] |= ((uint64_t)1 << (i_chunk % 64));
return TRUE;
}
void Curl_uint32_spbset_remove(struct uint32_spbset *bset, uint32_t i)
{
struct uint32_spbset_chunk *chunk;
uint32_t i_chunk;
chunk = uint32_spbset_get_chunk(bset, i, FALSE);
if(chunk) {
DEBUGASSERT(i >= chunk->offset);
i_chunk = (i - chunk->offset);
DEBUGASSERT((i_chunk / 64) < CURL_UINT32_SPBSET_CH_SLOTS);
chunk->slots[(i_chunk / 64)] &= ~((uint64_t)1 << (i_chunk % 64));
}
}
bool Curl_uint32_spbset_contains(struct uint32_spbset *bset, uint32_t i)
{
struct uint32_spbset_chunk *chunk;
uint32_t i_chunk;
chunk = uint32_spbset_get_chunk(bset, i, FALSE);
if(chunk) {
DEBUGASSERT(i >= chunk->offset);
i_chunk = (i - chunk->offset);
DEBUGASSERT((i_chunk / 64) < CURL_UINT32_SPBSET_CH_SLOTS);
return (chunk->slots[i_chunk / 64] &
((uint64_t)1 << (i_chunk % 64))) != 0;
}
return FALSE;
}
bool Curl_uint32_spbset_first(struct uint32_spbset *bset, uint32_t *pfirst)
{
struct uint32_spbset_chunk *chunk;
uint32_t i;
for(chunk = &bset->head; chunk; chunk = chunk->next) {
for(i = 0; i < CURL_UINT32_SPBSET_CH_SLOTS; ++i) {
if(chunk->slots[i]) {
*pfirst = chunk->offset + ((i * 64) + CURL_CTZ64(chunk->slots[i]));
return TRUE;
}
}
}
*pfirst = 0; /* give it a defined value even if it should not be used */
return FALSE;
}
static bool uint32_spbset_chunk_first(struct uint32_spbset_chunk *chunk,
uint32_t *pfirst)
{
uint32_t i;
for(i = 0; i < CURL_UINT32_SPBSET_CH_SLOTS; ++i) {
if(chunk->slots[i]) {
*pfirst = chunk->offset + ((i * 64) + CURL_CTZ64(chunk->slots[i]));
return TRUE;
}
}
*pfirst = UINT32_MAX; /* a value we cannot store */
return FALSE;
}
static bool uint32_spbset_chunk_next(struct uint32_spbset_chunk *chunk,
uint32_t last,
uint32_t *pnext)
{
if(chunk->offset <= last) {
uint64_t x;
uint32_t i = ((last - chunk->offset) / 64);
if(i < CURL_UINT32_SPBSET_CH_SLOTS) {
x = (chunk->slots[i] >> (last % 64));
if(x) {
/* more bits set, next is `last` + trailing 0s of the shifted slot */
*pnext = last + CURL_CTZ64(x);
return TRUE;
}
/* no more bits set in the last slot, scan forward */
for(i = i + 1; i < CURL_UINT32_SPBSET_CH_SLOTS; ++i) {
if(chunk->slots[i]) {
*pnext = chunk->offset + ((i * 64) + CURL_CTZ64(chunk->slots[i]));
return TRUE;
}
}
}
}
*pnext = UINT32_MAX;
return FALSE;
}
bool Curl_uint32_spbset_next(struct uint32_spbset *bset, uint32_t last,
uint32_t *pnext)
{
struct uint32_spbset_chunk *chunk;
uint32_t last_offset;
++last; /* look for the next higher number */
last_offset = (last & ~CURL_UINT32_SPBSET_CH_MASK);
for(chunk = &bset->head; chunk; chunk = chunk->next) {
if(chunk->offset >= last_offset) {
break;
}
}
if(chunk && (chunk->offset == last_offset)) {
/* is there a number higher than last in this chunk? */
if(uint32_spbset_chunk_next(chunk, last, pnext))
return TRUE;
/* not in this chunk */
chunk = chunk->next;
}
/* look for the first in the "higher" chunks, if there are any. */
while(chunk) {
if(uint32_spbset_chunk_first(chunk, pnext))
return TRUE;
chunk = chunk->next;
}
*pnext = UINT32_MAX;
return FALSE;
}