mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
139 lines
3.8 KiB
C
Vendored
Generated
139 lines
3.8 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 "tool_setup.h"
|
|
|
|
#include "tool_util.h"
|
|
|
|
#ifdef _WIN32
|
|
|
|
struct timeval tvrealnow(void)
|
|
{
|
|
/* UNIX EPOCH (1970-01-01) in FILETIME (1601-01-01) as 64-bit value */
|
|
static const uint64_t EPOCH = UINT64_C(116444736000000000);
|
|
SYSTEMTIME systime;
|
|
FILETIME ftime; /* 100ns since 1601-01-01, as double 32-bit value */
|
|
uint64_t time; /* 100ns since 1601-01-01, as 64-bit value */
|
|
struct timeval now;
|
|
|
|
GetSystemTime(&systime);
|
|
SystemTimeToFileTime(&systime, &ftime);
|
|
time = ((uint64_t)ftime.dwLowDateTime);
|
|
time += ((uint64_t)ftime.dwHighDateTime) << 32;
|
|
|
|
now.tv_sec = (long)((time - EPOCH) / 10000000L); /* unit is 100ns */
|
|
now.tv_usec = (long)(systime.wMilliseconds * 1000);
|
|
return now;
|
|
}
|
|
|
|
#else
|
|
|
|
struct timeval tvrealnow(void)
|
|
{
|
|
struct timeval now;
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
(void)gettimeofday(&now, NULL);
|
|
#else
|
|
now.tv_sec = time(NULL);
|
|
now.tv_usec = 0;
|
|
#endif
|
|
return now;
|
|
}
|
|
|
|
#endif
|
|
|
|
/* Case insensitive compare. Accept NULL pointers. */
|
|
int struplocompare(const char *p1, const char *p2)
|
|
{
|
|
if(!p1)
|
|
return p2 ? -1 : 0;
|
|
if(!p2)
|
|
return 1;
|
|
return CURL_STRICMP(p1, p2);
|
|
}
|
|
|
|
/* Indirect version to use as qsort callback. */
|
|
int struplocompare4sort(const void *p1, const void *p2)
|
|
{
|
|
return struplocompare(*(char * const *)p1, *(char * const *)p2);
|
|
}
|
|
|
|
#if defined(_WIN32) && !defined(__MINGW32__)
|
|
/*
|
|
* Truncate a file handle at a 64-bit position 'where'.
|
|
*/
|
|
int toolx_ftruncate_win32(int fd, curl_off_t where)
|
|
{
|
|
intptr_t handle = _get_osfhandle(fd);
|
|
|
|
if(curl_lseek(fd, where, SEEK_SET) == LSEEK_ERROR)
|
|
return -1;
|
|
|
|
if(!SetEndOfFile((HANDLE)handle))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
#elif defined(__DJGPP__)
|
|
/*
|
|
* Only supports 'off_t' (signed 32-bit) as file size.
|
|
*/
|
|
int toolx_ftruncate_djgpp(int fd, curl_off_t where)
|
|
{
|
|
if(where > INT_MAX)
|
|
return -1;
|
|
|
|
return ftruncate(fd, (off_t)where);
|
|
}
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
FILE *tool_execpath(const char *filename, char **pathp)
|
|
{
|
|
static char filebuffer[512];
|
|
unsigned long len;
|
|
/* Get the filename of our executable. GetModuleFileName is already declared
|
|
* via inclusions done in setup header file. We assume that we are using
|
|
* the ASCII version here.
|
|
*/
|
|
len = GetModuleFileNameA(0, filebuffer, sizeof(filebuffer));
|
|
if(len > 0 && len < sizeof(filebuffer)) {
|
|
/* We got a valid filename - get the directory part */
|
|
char *lastdirchar = strrchr(filebuffer, DIR_CHAR[0]);
|
|
if(lastdirchar) {
|
|
size_t remaining;
|
|
*lastdirchar = 0;
|
|
/* If we have enough space, build the RC filename */
|
|
remaining = sizeof(filebuffer) - strlen(filebuffer);
|
|
if(strlen(filename) < remaining - 1) {
|
|
curl_msnprintf(lastdirchar, remaining, "%s%s", DIR_CHAR, filename);
|
|
*pathp = filebuffer;
|
|
return curlx_fopen(filebuffer, FOPEN_READTEXT);
|
|
}
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
#endif
|