From 6c54b345aec52f87407ab34e3d1511e43f4df7e5 Mon Sep 17 00:00:00 2001
From: Brad House <brad@brad-house.com>
Date: Fri, 8 Nov 2024 10:18:21 -0500
Subject: [PATCH] Backport parts of bbea2cd from main

MSYS2's clang32 compiler is deprecated.  Fix distcheck.
---
 .github/workflows/msys2.yml | 1 -
 ci/distcheck.sh             | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 7976c102..b7ec085d 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -21,7 +21,6 @@ jobs:
       matrix:
         include:
           - { msystem: CLANG64, env: clang-x86_64, extra_packages: "mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-clang-analyzer" }
-          - { msystem: CLANG32, env: clang-i686,   extra_packages: "mingw-w64-clang-i686-clang mingw-w64-clang-i686-clang-analyzer"     }
           - { msystem: MINGW64, env: x86_64,       extra_packages: "mingw-w64-x86_64-gcc"                                               }
           - { msystem: MINGW32, env: i686,         extra_packages: "mingw-w64-i686-gcc"                                                 }
           # No need to test UCRT64 since clang64 uses UCRT
diff --git a/ci/distcheck.sh b/ci/distcheck.sh
index 39f4db9a..f0b62ae8 100755
--- a/ci/distcheck.sh
+++ b/ci/distcheck.sh
@@ -3,14 +3,9 @@
 # SPDX-License-Identifier: MIT
 set -e
 
-OS=""
-if [ "$TRAVIS_OS_NAME" != "" ]; then
-    OS="$TRAVIS_OS_NAME"
-elif [ "$CIRRUS_OS" != "" ]; then
-    OS="$CIRRUS_OS"
-fi
+OS=`uname -s || true`
 
-if [ "$OS" = "linux" ]; then
+if [ "$OS" = "Linux" ]; then
     # Make distribution tarball
     autoreconf -fi
     ./configure