mirror of
https://github.com/open-goal/jak-project
synced 2026-09-10 20:29:51 -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)
239 lines
7.9 KiB
C
Vendored
Generated
239 lines
7.9 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* 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"
|
|
|
|
#ifdef _WIN32
|
|
|
|
#include "curlx/version_win32.h"
|
|
|
|
#ifndef CURL_WINDOWS_UWP
|
|
/* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
|
|
and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */
|
|
struct OUR_OSVERSIONINFOEXW {
|
|
ULONG dwOSVersionInfoSize;
|
|
ULONG dwMajorVersion;
|
|
ULONG dwMinorVersion;
|
|
ULONG dwBuildNumber;
|
|
ULONG dwPlatformId;
|
|
WCHAR szCSDVersion[128];
|
|
USHORT wServicePackMajor;
|
|
USHORT wServicePackMinor;
|
|
USHORT wSuiteMask;
|
|
UCHAR wProductType;
|
|
UCHAR wReserved;
|
|
};
|
|
|
|
typedef LONG (APIENTRY *RTLVERIFYVERSIONINFO_FN)
|
|
(struct OUR_OSVERSIONINFOEXW *, ULONG, ULONGLONG);
|
|
static RTLVERIFYVERSIONINFO_FN s_pRtlVerifyVersionInfo;
|
|
|
|
void curlx_verify_windows_init(void)
|
|
{
|
|
#if defined(__clang__) && __clang_major__ >= 16
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wcast-function-type-strict"
|
|
#endif
|
|
s_pRtlVerifyVersionInfo = CURLX_FUNCTION_CAST(RTLVERIFYVERSIONINFO_FN,
|
|
GetProcAddress(GetModuleHandle(TEXT("ntdll")), "RtlVerifyVersionInfo"));
|
|
#if defined(__clang__) && __clang_major__ >= 16
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
}
|
|
#endif /* !CURL_WINDOWS_UWP */
|
|
|
|
/*
|
|
* curlx_verify_windows_version()
|
|
*
|
|
* This is used to verify if we are running on a specific Windows version.
|
|
*
|
|
* Parameters:
|
|
*
|
|
* majorVersion [in] - The major version number.
|
|
* minorVersion [in] - The minor version number.
|
|
* buildVersion [in] - The build version number. If 0, this parameter is
|
|
* ignored.
|
|
* platform [in] - The optional platform identifier.
|
|
* condition [in] - The test condition used to specifier whether we are
|
|
* checking a version less than, equal to or greater than
|
|
* what is specified in the major and minor version
|
|
* numbers.
|
|
*
|
|
* Returns TRUE if matched; otherwise FALSE.
|
|
*/
|
|
bool curlx_verify_windows_version(const unsigned int majorVersion,
|
|
const unsigned int minorVersion,
|
|
const unsigned int buildVersion,
|
|
const PlatformIdentifier platform,
|
|
const VersionCondition condition)
|
|
{
|
|
bool matched = FALSE;
|
|
|
|
#ifdef CURL_WINDOWS_UWP
|
|
/* We have no way to determine the Windows version from Windows apps,
|
|
so let's assume we are running on the target Windows version. */
|
|
const WORD fullVersion = MAKEWORD(minorVersion, majorVersion);
|
|
const WORD targetVersion = (WORD)_WIN32_WINNT;
|
|
|
|
(void)buildVersion;
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
matched = targetVersion < fullVersion;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
matched = targetVersion <= fullVersion;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
matched = targetVersion == fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
matched = targetVersion >= fullVersion;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
matched = targetVersion > fullVersion;
|
|
break;
|
|
}
|
|
|
|
if(matched && (platform == PLATFORM_WINDOWS)) {
|
|
/* we are always running on PLATFORM_WINNT */
|
|
matched = FALSE;
|
|
}
|
|
#else
|
|
ULONGLONG cm = 0;
|
|
struct OUR_OSVERSIONINFOEXW osver;
|
|
BYTE majorCondition;
|
|
BYTE minorCondition;
|
|
BYTE buildCondition;
|
|
BYTE spMajorCondition;
|
|
BYTE spMinorCondition;
|
|
DWORD dwTypeMask = VER_MAJORVERSION | VER_MINORVERSION |
|
|
VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR;
|
|
|
|
switch(condition) {
|
|
case VERSION_LESS_THAN:
|
|
majorCondition = VER_LESS;
|
|
minorCondition = VER_LESS;
|
|
buildCondition = VER_LESS;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_LESS_THAN_EQUAL:
|
|
majorCondition = VER_LESS_EQUAL;
|
|
minorCondition = VER_LESS_EQUAL;
|
|
buildCondition = VER_LESS_EQUAL;
|
|
spMajorCondition = VER_LESS_EQUAL;
|
|
spMinorCondition = VER_LESS_EQUAL;
|
|
break;
|
|
|
|
case VERSION_EQUAL:
|
|
majorCondition = VER_EQUAL;
|
|
minorCondition = VER_EQUAL;
|
|
buildCondition = VER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN_EQUAL:
|
|
majorCondition = VER_GREATER_EQUAL;
|
|
minorCondition = VER_GREATER_EQUAL;
|
|
buildCondition = VER_GREATER_EQUAL;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
case VERSION_GREATER_THAN:
|
|
majorCondition = VER_GREATER;
|
|
minorCondition = VER_GREATER;
|
|
buildCondition = VER_GREATER;
|
|
spMajorCondition = VER_GREATER_EQUAL;
|
|
spMinorCondition = VER_GREATER_EQUAL;
|
|
break;
|
|
|
|
default:
|
|
return FALSE;
|
|
}
|
|
|
|
memset(&osver, 0, sizeof(osver));
|
|
osver.dwOSVersionInfoSize = sizeof(osver);
|
|
osver.dwMajorVersion = majorVersion;
|
|
osver.dwMinorVersion = minorVersion;
|
|
osver.dwBuildNumber = buildVersion;
|
|
if(platform == PLATFORM_WINDOWS)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
|
|
else if(platform == PLATFORM_WINNT)
|
|
osver.dwPlatformId = VER_PLATFORM_WIN32_NT;
|
|
|
|
cm = VerSetConditionMask(cm, VER_MAJORVERSION, majorCondition);
|
|
cm = VerSetConditionMask(cm, VER_MINORVERSION, minorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMAJOR, spMajorCondition);
|
|
cm = VerSetConditionMask(cm, VER_SERVICEPACKMINOR, spMinorCondition);
|
|
|
|
if(platform != PLATFORM_DONT_CARE) {
|
|
cm = VerSetConditionMask(cm, VER_PLATFORMID, VER_EQUAL);
|
|
dwTypeMask |= VER_PLATFORMID;
|
|
}
|
|
|
|
/* Later versions of Windows have version functions that may not return the
|
|
real version of Windows unless the application is so manifested. We prefer
|
|
the real version always, so we use the Rtl variant of the function when
|
|
possible. Note though the function signatures have underlying fundamental
|
|
types that are the same, the return values are different. */
|
|
if(s_pRtlVerifyVersionInfo)
|
|
matched = !s_pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver, dwTypeMask, cm);
|
|
|
|
/* Compare the build number separately. VerifyVersionInfo normally compares
|
|
major.minor in hierarchical order (eg 1.9 is less than 2.0) but does not
|
|
do the same for build (eg 1.9 build 222 is not less than 2.0 build 111).
|
|
Build comparison is only needed when build numbers are equal (eg 1.9 is
|
|
always less than 2.0 so build comparison is not needed). */
|
|
if(matched && buildVersion &&
|
|
(condition == VERSION_EQUAL ||
|
|
((condition == VERSION_GREATER_THAN_EQUAL ||
|
|
condition == VERSION_LESS_THAN_EQUAL) &&
|
|
curlx_verify_windows_version(majorVersion, minorVersion, 0,
|
|
platform, VERSION_EQUAL)))) {
|
|
|
|
cm = VerSetConditionMask(0, VER_BUILDNUMBER, buildCondition);
|
|
dwTypeMask = VER_BUILDNUMBER;
|
|
if(s_pRtlVerifyVersionInfo)
|
|
matched = !s_pRtlVerifyVersionInfo(&osver, dwTypeMask, cm);
|
|
else
|
|
matched = !!VerifyVersionInfoW((OSVERSIONINFOEXW *)&osver,
|
|
dwTypeMask, cm);
|
|
}
|
|
|
|
#endif
|
|
|
|
return matched;
|
|
}
|
|
|
|
#endif /* _WIN32 */
|