Merge pull request #5909 from ifarbod/patch-1

Obtain MinGW's path from LLVM_MINGW_DIR/ROOT
xmake-io · Dec 1, 2024 · ee024dc · ee024dc
2 parents 50f38ee + 04304b3
commit ee024dc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xmake/modules/detect/sdks/find_mingw.lua b/xmake/modules/detect/sdks/find_mingw.lua
@@ -41,8 +41,8 @@ function _find_mingwdir(sdkdir)
             sdkdir = "/opt/homebrew/opt/mingw-w64"
         elseif is_host("linux") then
             sdkdir = "/usr"
-        elseif is_subhost("msys") then
-            local mingw_prefix = os.getenv("MINGW_PREFIX")
+        else
+            local mingw_prefix = is_subhost("msys") and os.getenv("MINGW_PREFIX") or os.getenv("LLVM_MINGW_DIR") or os.getenv("LLVM_MINGW_ROOT")
             if mingw_prefix and os.isdir(mingw_prefix) then
                 sdkdir = mingw_prefix
             end