mirror of
https://github.com/open-goal/jak-project
synced 2026-08-28 08:49:16 -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)
193 lines
5.6 KiB
CMake
Vendored
Generated
193 lines
5.6 KiB
CMake
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
|
|
#
|
|
###########################################################################
|
|
if(NOT WIN32)
|
|
message(FATAL_ERROR "This file should be included on Windows platform only")
|
|
endif()
|
|
|
|
if(MINGW)
|
|
set(HAVE_BASENAME 1)
|
|
set(HAVE_BOOL_T 1) # = HAVE_STDBOOL_H
|
|
set(HAVE_DIRENT_H 1)
|
|
set(HAVE_GETTIMEOFDAY 1)
|
|
set(HAVE_LIBGEN_H 1)
|
|
set(HAVE_OPENDIR 1)
|
|
set(HAVE_STDBOOL_H 1)
|
|
set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size()
|
|
set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size()
|
|
set(HAVE_STRINGS_H 1) # wrapper to string.h
|
|
set(HAVE_SYS_PARAM_H 1)
|
|
set(HAVE_UNISTD_H 1)
|
|
set(HAVE_UTIME_H 1) # wrapper to sys/utime.h
|
|
else()
|
|
set(HAVE_DIRENT_H 0)
|
|
set(HAVE_GETTIMEOFDAY 0)
|
|
set(HAVE_LIBGEN_H 0)
|
|
set(HAVE_OPENDIR 0)
|
|
set(HAVE_STRINGS_H 0)
|
|
set(HAVE_SYS_PARAM_H 0)
|
|
set(HAVE_UTIME_H 0)
|
|
if(MSVC)
|
|
set(HAVE_UNISTD_H 0)
|
|
set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size()
|
|
set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size()
|
|
if(MSVC_VERSION GREATER_EQUAL 1800)
|
|
set(HAVE_STDBOOL_H 1)
|
|
else()
|
|
set(HAVE_STDBOOL_H 0)
|
|
endif()
|
|
set(HAVE_BOOL_T "${HAVE_STDBOOL_H}")
|
|
set(HAVE_BASENAME 0)
|
|
endif()
|
|
endif()
|
|
|
|
if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.9) OR
|
|
(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.6))
|
|
# MinGW or clang-cl
|
|
set(HAVE_STDATOMIC_H 1)
|
|
set(HAVE_ATOMIC 1)
|
|
else()
|
|
set(HAVE_STDATOMIC_H 0)
|
|
set(HAVE_ATOMIC 0)
|
|
endif()
|
|
|
|
set(HAVE_ACCEPT4 0)
|
|
set(HAVE_ALARM 0)
|
|
set(HAVE_ARC4RANDOM 0)
|
|
set(HAVE_ARPA_INET_H 0)
|
|
set(HAVE_CLOSESOCKET 1)
|
|
set(HAVE_EVENTFD 0)
|
|
set(HAVE_FCNTL 0)
|
|
set(HAVE_FCNTL_H 1)
|
|
set(HAVE_FCNTL_O_NONBLOCK 0)
|
|
set(HAVE_FNMATCH 0)
|
|
set(HAVE_FREEADDRINFO 1) # Available in Windows XP and newer
|
|
set(HAVE_FSETXATTR 0)
|
|
set(HAVE_GETADDRINFO 1) # Available in Windows XP and newer
|
|
set(HAVE_GETEUID 0)
|
|
set(HAVE_GETHOSTBYNAME_R 0)
|
|
set(HAVE_GETHOSTBYNAME_R_3 0)
|
|
set(HAVE_GETHOSTBYNAME_R_3_REENTRANT 0)
|
|
set(HAVE_GETHOSTBYNAME_R_5 0)
|
|
set(HAVE_GETHOSTBYNAME_R_5_REENTRANT 0)
|
|
set(HAVE_GETHOSTBYNAME_R_6 0)
|
|
set(HAVE_GETHOSTBYNAME_R_6_REENTRANT 0)
|
|
set(HAVE_GETHOSTNAME 1)
|
|
set(HAVE_GETIFADDRS 0)
|
|
set(HAVE_GETPASS_R 0)
|
|
set(HAVE_GETPEERNAME 1)
|
|
set(HAVE_GETPPID 0)
|
|
set(HAVE_GETPWUID 0)
|
|
set(HAVE_GETPWUID_R 0)
|
|
set(HAVE_GETRLIMIT 0)
|
|
set(HAVE_GETSOCKNAME 1)
|
|
set(HAVE_GLIBC_STRERROR_R 0)
|
|
set(HAVE_GMTIME_R 0)
|
|
set(HAVE_IFADDRS_H 0)
|
|
set(HAVE_INET_NTOP 0)
|
|
set(HAVE_INET_PTON 0)
|
|
set(HAVE_IOCTLSOCKET 1)
|
|
set(HAVE_IOCTLSOCKET_CAMEL 0)
|
|
set(HAVE_IOCTLSOCKET_CAMEL_FIONBIO 0)
|
|
set(HAVE_IOCTLSOCKET_FIONBIO 1)
|
|
set(HAVE_IOCTL_FIONBIO 0)
|
|
set(HAVE_IOCTL_SIOCGIFADDR 0)
|
|
set(HAVE_IO_H 1)
|
|
set(HAVE_LINUX_TCP_H 0)
|
|
set(HAVE_LOCALE_H 1)
|
|
set(HAVE_LOCALTIME_R 0)
|
|
set(HAVE_MEMRCHR 0)
|
|
set(HAVE_NETDB_H 0)
|
|
set(HAVE_NETINET_IN6_H 0)
|
|
set(HAVE_NETINET_IN_H 0)
|
|
set(HAVE_NETINET_TCP_H 0)
|
|
set(HAVE_NETINET_UDP_H 0)
|
|
set(HAVE_NET_IF_H 0)
|
|
set(HAVE_PIPE 0)
|
|
set(HAVE_PIPE2 0)
|
|
set(HAVE_POLL 0)
|
|
set(HAVE_POLL_H 0)
|
|
set(HAVE_POSIX_STRERROR_R 0)
|
|
set(HAVE_PWD_H 0)
|
|
set(HAVE_RECV 1)
|
|
set(HAVE_SELECT 1)
|
|
set(HAVE_SEND 1)
|
|
set(HAVE_SENDMMSG 0)
|
|
set(HAVE_SENDMSG 0)
|
|
set(HAVE_SETLOCALE 1)
|
|
set(HAVE_SETRLIMIT 0)
|
|
set(HAVE_SETSOCKOPT_SO_NONBLOCK 0)
|
|
set(HAVE_SIGACTION 0)
|
|
set(HAVE_SIGINTERRUPT 0)
|
|
set(HAVE_SIGNAL 1)
|
|
set(HAVE_SIGSETJMP 0)
|
|
set(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1)
|
|
set(HAVE_SOCKET 1)
|
|
set(HAVE_SOCKETPAIR 0)
|
|
set(HAVE_STRERROR_R 0)
|
|
set(HAVE_STROPTS_H 0)
|
|
set(HAVE_STRUCT_SOCKADDR_STORAGE 1)
|
|
set(HAVE_STRUCT_TIMEVAL 1)
|
|
set(HAVE_SYS_EVENTFD_H 0)
|
|
set(HAVE_SYS_FILIO_H 0)
|
|
set(HAVE_SYS_IOCTL_H 0)
|
|
set(HAVE_SYS_POLL_H 0)
|
|
set(HAVE_SYS_RESOURCE_H 0)
|
|
set(HAVE_SYS_SELECT_H 0)
|
|
set(HAVE_SYS_SOCKIO_H 0)
|
|
set(HAVE_SYS_TYPES_H 1)
|
|
set(HAVE_SYS_UN_H 0)
|
|
set(HAVE_SYS_UTIME_H 1)
|
|
set(HAVE_TERMIOS_H 0)
|
|
set(HAVE_TERMIO_H 0)
|
|
set(HAVE_TIME_T_UNSIGNED 0)
|
|
set(HAVE_UTIME 1)
|
|
set(HAVE_UTIMES 0)
|
|
set(STDC_HEADERS 1)
|
|
|
|
# Types and sizes
|
|
|
|
set(HAVE_SIZEOF_SA_FAMILY_T 0)
|
|
set(HAVE_SIZEOF_SUSECONDS_T 0)
|
|
|
|
if(MINGW OR MSVC)
|
|
curl_prefill_type_size("INT" 4)
|
|
curl_prefill_type_size("LONG" 4)
|
|
curl_prefill_type_size("__INT64" 8)
|
|
curl_prefill_type_size("CURL_OFF_T" 8)
|
|
curl_prefill_type_size("CURL_SOCKET_T" ${CMAKE_SIZEOF_VOID_P})
|
|
curl_prefill_type_size("SIZE_T" ${CMAKE_SIZEOF_VOID_P})
|
|
# TIME_T: 8 for _WIN64 or UCRT or MSVC, 4 otherwise
|
|
# Also 4 for non-UCRT 32-bit when _USE_32BIT_TIME_T is set.
|
|
# mingw-w64 sets _USE_32BIT_TIME_T unless __MINGW_USE_VC2005_COMPAT is explicit defined.
|
|
if(MSVC)
|
|
set(HAVE_SIZEOF_SSIZE_T 0)
|
|
set(HAVE_FILE_OFFSET_BITS 0)
|
|
curl_prefill_type_size("OFF_T" 4)
|
|
else()
|
|
curl_prefill_type_size("SSIZE_T" ${CMAKE_SIZEOF_VOID_P})
|
|
set(HAVE_FILE_OFFSET_BITS 1) # mingw-w64 v3+
|
|
curl_prefill_type_size("OFF_T" 8) # mingw-w64 v3+
|
|
endif()
|
|
endif()
|