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

215 lines
8.9 KiB
Python
Vendored
Generated

#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#***************************************************************************
# _ _ ____ _
# 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
#
###########################################################################
#
import difflib
import filecmp
import logging
import os
import pytest
from testenv import CurlClient, Env, Sshd
log = logging.getLogger(__name__)
@pytest.mark.skipif(condition=not Env.curl_has_protocol('scp'), reason="curl built without scp:")
@pytest.mark.skipif(condition=not Env.has_sshd(), reason="missing sshd")
class TestScp:
@pytest.fixture(autouse=True, scope='class')
def _class_scope(self, env, sshd):
env.make_data_file(indir=sshd.home_dir, fname="data-10k", fsize=10 * 1024)
env.make_data_file(indir=sshd.home_dir, fname="data-10m", fsize=10 * 1024 * 1024)
env.make_data_file(indir=env.gen_dir, fname="data-10k", fsize=10 * 1024)
env.make_data_file(indir=env.gen_dir, fname="data-10m", fsize=10 * 1024 * 1024)
def test_50_01_insecure(self, env: Env, sshd: Sshd):
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}'
r = curl.ssh_download(urls=[url], extra_args=[
'--insecure',
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
def test_50_02_unknown_hosts(self, env: Env, sshd: Sshd):
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}'
r = curl.ssh_download(urls=[url], extra_args=[
'--knownhosts', sshd.unknown_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(60) # CURLE_PEER_FAILED_VERIFICATION
def test_50_03_known_hosts(self, env: Env, sshd: Sshd):
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}'
r = curl.ssh_download(urls=[url], extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
# use key not in authorized_keys file
def test_50_04_unauth_user(self, env: Env, sshd: Sshd):
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}'
r = curl.ssh_download(urls=[url], extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user2_pubkey_file,
'--key', sshd.user2_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(67) # CURLE_LOGIN_DENIED
def test_50_10_dl_single(self, env: Env, sshd: Sshd):
count = 1
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data-10k')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}?[0-{count-1}]'
r = curl.ssh_download(urls=[url], extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
self.check_downloads(curl, doc_file, count)
def test_50_11_dl_serial(self, env: Env, sshd: Sshd):
count = 5
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data-10k')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}?[0-{count-1}]'
r = curl.ssh_download(urls=[url], extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
self.check_downloads(curl, doc_file, count)
def test_50_12_dl_parallel(self, env: Env, sshd: Sshd):
count = 5
curl = CurlClient(env=env)
doc_file = os.path.join(sshd.home_dir, 'data-10k')
url = f'scp://{env.domain1}:{sshd.port}/{doc_file}?[0-{count-1}]'
r = curl.http_download(urls=[url], extra_args=[
'--parallel',
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
self.check_downloads(curl, doc_file, count)
def test_50_20_ul_single(self, env: Env, sshd: Sshd):
srcfile = os.path.join(env.gen_dir, 'data-10k')
destfile = os.path.join(sshd.home_dir, 'upload_20.data')
curl = CurlClient(env=env)
url = f'scp://{env.domain1}:{sshd.port}/{destfile}'
r = curl.ssh_upload(urls=[url], fupload=srcfile, extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
self.check_upload(sshd, srcfile, destfile)
def test_50_21_ul_serial(self, env: Env, sshd: Sshd):
count = 5
srcfile = os.path.join(env.gen_dir, 'data-10k')
destfile = os.path.join(sshd.home_dir, 'upload_21.data')
curl = CurlClient(env=env)
url = f'scp://{env.domain1}:{sshd.port}/{destfile}.[0-{count-1}]'
r = curl.ssh_upload(urls=[url], fupload=srcfile, extra_args=[
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
for i in range(count):
self.check_upload(sshd, srcfile, f'{destfile}.{i}')
def test_50_22_ul_parallel(self, env: Env, sshd: Sshd):
count = 5
srcfile = os.path.join(env.gen_dir, 'data-10k')
destfile = os.path.join(sshd.home_dir, 'upload_22.data')
curl = CurlClient(env=env)
url = f'scp://{env.domain1}:{sshd.port}/{destfile}.[0-{count-1}]'
r = curl.ssh_upload(urls=[url], fupload=srcfile, extra_args=[
'--parallel',
'--knownhosts', sshd.known_hosts,
'--pubkey', sshd.user1_pubkey_file,
'--key', sshd.user1_privkey_file,
'--user', f'{os.environ["USER"]}:',
])
r.check_exit_code(0)
for i in range(count):
self.check_upload(sshd, srcfile, f'{destfile}.{i}')
def check_downloads(self, client, srcfile: str, count: int,
complete: bool = True):
for i in range(count):
dfile = client.download_file(i)
assert os.path.exists(dfile)
if complete and not filecmp.cmp(srcfile, dfile, shallow=False):
with open(srcfile) as fa, open(dfile) as fb:
a = fa.readlines()
b = fb.readlines()
diff = "".join(difflib.unified_diff(a=a, b=b,
fromfile=srcfile,
tofile=dfile,
n=1))
assert False, f'download {dfile} differs:\n{diff}'
def check_upload(self, sshd: Sshd, srcfile, destfile, binary=True):
assert os.path.exists(srcfile)
assert os.path.exists(destfile)
if not filecmp.cmp(srcfile, destfile, shallow=False):
with open(srcfile) as fa, open(destfile) as fb:
a = fa.readlines()
b = fb.readlines()
diff = "".join(difflib.unified_diff(a=a, b=b,
fromfile=srcfile,
tofile=destfile,
n=1))
assert not binary and len(diff) == 0, f'upload {destfile} differs:\n{diff}'