From a1bfe5ee5ee2a31311f5edda7ff177dd113608f4 Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Tue, 25 Aug 2026 03:03:28 +0800 Subject: [PATCH] ci: msys2 clang-libs; drop the msvcrt link workaround The job hook no longer injects the MSVC INCLUDE/LIB into the msys2 steps, so the unset/-lmsvcrt workaround is unnecessary. --- .gitea/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6d466e8cd..f1e0c098f 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -212,7 +212,7 @@ jobs: pacman -S --needed --noconfirm \ mingw-w64-ucrt-x86_64-cmake \ mingw-w64-ucrt-x86_64-opencolorio \ - mingw-w64-ucrt-x86_64-clang git + mingw-w64-ucrt-x86_64-clang mingw-w64-ucrt-x86_64-clang-libs git # ------------------------------------------------------------------ # Build environment @@ -286,13 +286,13 @@ jobs: # The runner's job hook injects the MSVC INCLUDE/LIB into every # step; clear them in-step (they poison the MinGW compiles with # MSVC SDK headers). - unset INCLUDE LIB + # unset INCLUDE LIB # mingw-w64 >= Nov 2025 forwards _assert to __msvcrt_assert inside # libmingwex.a; rustc's link order puts -lmingwex last, so any # binary that pulls _assert.o leaves _fileno/_setmode/ # __imp___msvcrt_assert unresolved. A trailing -lmsvcrt re-scans # the CRT import lib after libmingwex. - export RUSTFLAGS="-C link-args=-lmsvcrt" + # export RUSTFLAGS="-C link-args=-lmsvcrt" cargo build --workspace --locked - name: Test