Skip to content

Commit 0861529

Browse files
committed
Merge pull request godotengine#104744 from Repiteo/scons/ensure-mingw-fallback
SCons: Ensure MinGW as fallback if missing MSVC
2 parents afe5b89 + 7a28334 commit 0861529

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

platform/windows/detect.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ def detect_build_env_arch():
148148

149149

150150
def get_tools(env: "SConsEnvironment"):
151-
if os.name != "nt" or env.get("use_mingw"):
151+
from SCons.Tool.MSCommon import msvc_exists
152+
153+
if os.name != "nt" or env.get("use_mingw") or not msvc_exists():
152154
return ["mingw"]
153155
else:
154156
msvc_arch_aliases = {"x86_32": "x86", "arm32": "arm"}

0 commit comments

Comments
 (0)