diff options
| author | ruki <[email protected]> | 2024-04-27 15:08:49 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-27 15:08:49 +0800 |
| commit | eab39cddb2fef56e3c5e716ff0bcb9c9b3a5bc3a (patch) | |
| tree | a72a09d67ccb6a726b30aafeb6d3177221780ca5 | |
| parent | cf42445dd5dce09224ee1bfa28f2925ce50d7eeb (diff) | |
| parent | dcfffe48969339ee4263e69c22a5d1de60fc824b (diff) | |
Merge pull request #5019 from c8ef/dev
MacOS Arm MinGW toolchain fix
| -rw-r--r-- | xmake/modules/detect/sdks/find_mingw.lua | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmake/modules/detect/sdks/find_mingw.lua b/xmake/modules/detect/sdks/find_mingw.lua index 69b6a1df9..4085a6cb8 100644 --- a/xmake/modules/detect/sdks/find_mingw.lua +++ b/xmake/modules/detect/sdks/find_mingw.lua @@ -34,7 +34,11 @@ function _find_mingwdir(sdkdir) if is_host("macosx", "linux") and os.isdir("/opt/llvm-mingw") then sdkdir = "/opt/llvm-mingw" elseif is_host("macosx") and os.isdir("/usr/local/opt/mingw-w64") then + -- for macOS Intel sdkdir = "/usr/local/opt/mingw-w64" + elseif is_host("macosx") and os.isdir("/opt/homebrew/opt/mingw-w64") then + -- for Apple Silicon + sdkdir = "/opt/homebrew/opt/mingw-w64" elseif is_host("linux") then sdkdir = "/usr" elseif is_subhost("msys") then |