Use MSYS Makefiles again

lauzadis · lauzadis · commit 5e7889890734 · 2025-08-05T15:38:45.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
@@ -123,10 +123,10 @@ private fun Project.registerCmakeConfigureTask(
                 }
             }
 
-            // if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
-            //     args.add("-G")
-            //     args.add("MSYS Makefiles")
-            // }
+            if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
+                args.add("-G")
+                args.add("MSYS Makefiles")
+            }
 
             // FIXME? Compiling s2n-tls on GitHub Actions Ubuntu image (without Docker / cross-compilation) has errors like:
             // In function ‘s2n_hash_algorithms_init’

Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,10 @@ private fun Project.registerCmakeConfigureTask(`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- // if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {`
`127`		`- // args.add("-G")`
`128`		`- // args.add("MSYS Makefiles")`
`129`		`- // }`
	`126`	`+ if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {`
	`127`	`+ args.add("-G")`
	`128`	`+ args.add("MSYS Makefiles")`
	`129`	`+ }`
`130`	`130`
`131`	`131`	`// FIXME? Compiling s2n-tls on GitHub Actions Ubuntu image (without Docker / cross-compilation) has errors like:`
`132`	`132`	`// In function ‘s2n_hash_algorithms_init’`