Go back to MSYS Makefiles

lauzadis · lauzadis · commit a833d1197c0c · 2025-08-08T13:28:21.000-04:00
diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt b/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 "Unix Makefiles" instead
             if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
-                args.addAll(listOf("-G", "Unix Makefiles"))
+                args.addAll(listOf("-G", "MSYS Makefiles"))
             }
 
             // FIXME? Compiling s2n-tls on GitHub Actions Ubuntu image (without Docker / cross-compilation) has errors like:

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