mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -04:00
5d5e35fb9b
## 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)
92 lines
1.9 KiB
XML
Vendored
Generated
92 lines
1.9 KiB
XML
Vendored
Generated
<?xml version="1.0" encoding="US-ASCII"?>
|
|
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP proxy
|
|
HSTS
|
|
curl_easy_duphandle
|
|
</keywords>
|
|
</info>
|
|
|
|
<reply>
|
|
<!-- Response to the original handle's direct HTTP request.
|
|
Strict-Transport-Security header populates the live HSTS cache. -->
|
|
<data nocheck="yes" crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Type: text/plain
|
|
Content-Length: 5
|
|
Strict-Transport-Security: max-age=31536000
|
|
|
|
Hello
|
|
</data>
|
|
|
|
<!-- Response to the dup handle's proxy CONNECT attempt.
|
|
The CONNECT to port 443 proves the copied
|
|
HSTS cache upgraded the dup's HTTP URL to HTTPS. -->
|
|
<connect crlf="headers">
|
|
HTTP/1.1 403 Forbidden
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
</connect>
|
|
</reply>
|
|
|
|
<client>
|
|
<features>
|
|
HSTS
|
|
https
|
|
Debug
|
|
proxy
|
|
</features>
|
|
<server>
|
|
http
|
|
http-proxy
|
|
</server>
|
|
<setenv>
|
|
CURL_HSTS_HTTP=yes
|
|
</setenv>
|
|
<name>
|
|
curl_easy_duphandle copies HSTS cache, auto upgrading HTTP to HTTPS.
|
|
</name>
|
|
<tool>
|
|
lib%TESTNUMBER
|
|
</tool>
|
|
<command>
|
|
- %HOSTIP %HTTPPORT %PROXYPORT
|
|
</command>
|
|
</client>
|
|
|
|
<verify>
|
|
# First request: original handle GETs from the http server; the response
|
|
# carries Strict-Transport-Security, populating the live HSTS cache that
|
|
# the dup inherits.
|
|
<protocol crlf="headers">
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: hsts.example.com:%HTTPPORT
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
# Second request: dup handle upgraded HTTP to HTTPS by copied HSTS cache,
|
|
# proxy receives CONNECT to port 443 proving the upgrade happened
|
|
<proxy crlf="headers">
|
|
CONNECT hsts.example.com:443 HTTP/1.1
|
|
Host: hsts.example.com:443
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</proxy>
|
|
<stdout>
|
|
First request: HSTS cache populated
|
|
Dup effective URL: https://hsts.example.com/%TESTNUMBER
|
|
</stdout>
|
|
# CURLE_COULDNT_CONNECT (7) is intentional: The proxy rejects the CONNECT
|
|
# to port 443, collapsing the tunnel. All that is being validated is the
|
|
# CONNECT to port 443 itself.
|
|
<errorcode>
|
|
7
|
|
</errorcode>
|
|
</verify>
|
|
</testcase>
|