]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
runtests: recognize lowercase `windows` in `curl -V`
authorViktor Szakats <commit@vsz.me>
Thu, 17 Apr 2025 14:52:52 +0000 (16:52 +0200)
committerViktor Szakats <commit@vsz.me>
Thu, 17 Apr 2025 17:16:00 +0000 (19:16 +0200)
As in vcpkg triplets. Test it in CI.

Closes #17088

.github/workflows/windows.yml
tests/runtests.pl

index 038d6e7a1ad26a0eeb289be919f1e5eb1675ecf6..2c256b82b99f6454fbbe5fdfaea3da14c5be9e63 100644 (file)
@@ -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}" \
index 7ba2eb4284f43cddc088e41d3095be15fd27e38d..a3c6c2d8b20dde0cedcc5aecd63fc97f6637ee81 100755 (executable)
@@ -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();