diff --git a/scons/cross_compile.py b/scons/cross_compile.py
index afa9138f05f..0c9d0cc10ed 100644
--- a/scons/cross_compile.py
+++ b/scons/cross_compile.py
@@ -2,7 +2,7 @@
 import os
 
 def setup_cross_compile(env):
-    if "mingw" in env["host"]:
+    if "mingw" in env["host"] or env["PLATFORM"] == "msys":
         env["PLATFORM"] = "win32"
         env["PROGSUFFIX"] = ".exe"
         env.Tool("mingw")