From 11ac8e1936af41a88591537bbbd2edaba44cbb14 Mon Sep 17 00:00:00 2001
From: Samuel Nicholas <nicholas.samuel@gmail.com>
Date: Fri, 13 Dec 2024 17:51:36 +1030
Subject: [PATCH] first attempt

---
 tools/windows.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/windows.py b/tools/windows.py
index f66bce423..135073f05 100644
--- a/tools/windows.py
+++ b/tools/windows.py
@@ -3,7 +3,7 @@
 
 import common_compiler_flags
 import my_spawn
-from SCons.Tool import mingw, msvc
+from SCons.Tool import mingw, msvc, clangxx, clang
 from SCons.Variables import BoolVariable
 
 
@@ -73,14 +73,17 @@ def spawn_capture(sh, escape, cmd, args, env):
 
 
 def options(opts):
-    mingw = os.getenv("MINGW_PREFIX", "")
+    msystem = os.getenv("MSYSTEM", "")
+    mingw_prefix=""
+    if not msystem:
+        mingw_prefix = os.getenv("MINGW_PREFIX", "")
 
     opts.Add(BoolVariable("use_mingw", "Use the MinGW compiler instead of MSVC - only effective on Windows", False))
     opts.Add(BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True))
     opts.Add(BoolVariable("silence_msvc", "Silence MSVC's cl/link stdout bloat, redirecting errors to stderr.", True))
     opts.Add(BoolVariable("debug_crt", "Compile with MSVC's debug CRT (/MDd)", False))
     opts.Add(BoolVariable("use_llvm", "Use the LLVM compiler (MVSC or MinGW depending on the use_mingw flag)", False))
-    opts.Add("mingw_prefix", "MinGW prefix", mingw)
+    opts.Add("mingw_prefix", "MinGW prefix", mingw_prefix)
 
 
 def exists(env):
@@ -132,7 +135,12 @@ def generate(env):
 
     elif (sys.platform == "win32" or sys.platform == "msys") and not env["mingw_prefix"]:
         env["use_mingw"] = True
-        mingw.generate(env)
+        if env["use_llvm"]:
+            clang.generate(env)
+            clangxx.generate(env)
+        else:
+            mingw.generate(env)
+
         # Don't want lib prefixes
         env["IMPLIBPREFIX"] = ""
         env["SHLIBPREFIX"] = ""