actually, add back Unix Makefiles

Author: lauzadis

.github/workflows/ci.yaml

@@ -151,11 +151,10 @@ jobs:
       - name: Set up MSYS2
         uses: msys2/setup-msys2@v2
         with:
-          msystem: MSYS
+          msystem: MINGW64
           install: >-
-            cmake
-            make
-            gcc
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-gcc
       - name: Setup build environment
         uses: ./.github/actions/setup-build
       - name: Build and Test ${{ env.PACKAGE_NAME }}

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt

@@ -126,7 +126,7 @@ private fun Project.registerCmakeConfigureTask(
             // The default CMake generator on Windows is "NMake Makefiles", requiring nmake.exe which is not installed by default on many hosts.
             // We use msys2/GCC to build, so configure "MSYS Makefiles" instead
             if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
-                // args.addAll(listOf("-G", "Unix Makefiles"))
+                args.addAll(listOf("-G", "Unix Makefiles"))
             }
 
             // FIXME? Compiling s2n-tls on GitHub Actions Ubuntu image (without Docker / cross-compilation) has errors like: