diff options
| author | ruki <[email protected]> | 2022-03-16 23:37:51 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-03-16 23:37:51 +0800 |
| commit | e4ca9d42da37793d9c414e22eb6da73fb81a2a06 (patch) | |
| tree | 1df4dc2700508f7a7810ab61fb80b2d3a1d9ddab | |
| parent | b2324c456276dc451a19edb9ace2fb640df3e0c4 (diff) | |
improve find_mingw
| -rw-r--r-- | xmake/modules/detect/sdks/find_mingw.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/modules/detect/sdks/find_mingw.lua b/xmake/modules/detect/sdks/find_mingw.lua index 52cf75608..cbae81d8c 100644 --- a/xmake/modules/detect/sdks/find_mingw.lua +++ b/xmake/modules/detect/sdks/find_mingw.lua @@ -49,7 +49,7 @@ function _find_mingwdir(sdkdir) local pathenv = os.getenv("PATH") if pathenv then local buildhash_pattern = string.rep('%x', 32) - local match_pattern = "[\\/]packages[\\/]%w[\\/][^\\/]+[\\/][^\\/]+[\\/]" .. buildhash_pattern .. "[\\/]bin" + local match_pattern = "[\\/]packages[\\/]m[\\/]mingw[%w%-%_%+]*[\\/][^\\/]+[\\/]" .. buildhash_pattern .. "[\\/]bin" for _, p in ipairs(path.splitenv(pathenv)) do if (p:find(match_pattern) or p:find(string.ipattern("mingw[%w%-%_%+]*[\\/]bin"))) and path.filename(p) == "bin" and os.isdir(p) then |