diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 038d6e7a1a..2c256b82b9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -897,6 +897,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DVCPKG_INSTALLED_DIR="$VCPKG_INSTALLATION_ROOT/installed" \ -DVCPKG_TARGET_TRIPLET='${{ matrix.arch }}-${{ matrix.plat }}' \ + -DCMAKE_C_COMPILER_TARGET='${{ matrix.arch }}-${{ matrix.plat }}' \ -DCMAKE_C_FLAGS="${cflags}" \ -DCMAKE_EXE_LINKER_FLAGS="-INCREMENTAL:NO ${ldflags}" \ -DCMAKE_SHARED_LINKER_FLAGS="-INCREMENTAL:NO ${ldflags}" \ diff --git a/tests/runtests.pl b/tests/runtests.pl index 7ba2eb4284..a3c6c2d8b2 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -542,7 +542,7 @@ sub checksystemfeatures { # system support LD_PRELOAD; may be disabled later $feature{"ld_preload"} = 1; } - if($curl =~ /win32|Windows|mingw(32|64)/) { + if($curl =~ /win32|Windows|windows|mingw(32|64)/) { # This is a Windows MinGW build or native build, we need to use # Windows-style path. $pwd = sys_native_current_path();