Windows: switch to MSYS2 clang environment

Author: mathiascode

.github/workflows/packaging.yml

@@ -98,7 +98,7 @@ jobs:
       matrix:
         include:
           - arch: x86_64
-            prefix: mingw-w64-x86_64
+            prefix: mingw-w64-clang-x86_64
     defaults:
       run:
         shell: msys2 {0}
@@ -109,7 +109,7 @@ jobs:
       - name: Setup msys2
         uses: msys2/setup-msys2@v2
         with:
-          msystem: mingw64
+          msystem: clang64
           release: false
           update: true
           install: >-

.github/workflows/tests.yml

@@ -180,7 +180,7 @@ jobs:
       matrix:
         include:
           - arch: x86_64
-            prefix: mingw-w64-x86_64
+            prefix: mingw-w64-clang-x86_64
     defaults:
       run:
         shell: msys2 {0}
@@ -191,7 +191,7 @@ jobs:
       - name: Setup msys2
         uses: msys2/setup-msys2@v2
         with:
-          msystem: mingw64
+          msystem: clang64
           release: false
           update: true
           install: >-

doc/PACKAGING.md

@@ -58,7 +58,7 @@ your own machine.
 ### Building a Frozen Application with cx_Freeze
 
 Follow the instructions on [installing MSYS2](https://www.msys2.org/#installation).
-Once MSYS2 is installed, launch the MINGW64 environment.
+Once MSYS2 is installed, launch the CLANG64 environment.
 
 Clone the `nicotine-plus` Git repository:
 
@@ -72,7 +72,7 @@ Install dependencies:
 
 ```sh
 export ARCH=x86_64
-pacman --noconfirm -S --needed mingw-w64-$ARCH-python
+pacman --noconfirm -S --needed mingw-w64-clang-$ARCH-python
 python3 packaging/windows/dependencies.py
 ```
 

packaging/windows/dependencies.py

@@ -25,7 +25,7 @@ def install_pacman():
     """Install dependencies from the main MinGW repos."""
 
     arch = os.environ.get("ARCH", "x86_64")
-    prefix = "mingw-w64-clang-aarch64" if arch == "arm64" else "mingw-w64-x86_64"
+    prefix = "mingw-w64-clang-aarch64" if arch == "arm64" else "mingw-w64-clang-x86_64"
 
     packages = [f"{prefix}-ca-certificates",
                 f"{prefix}-gettext-tools",