diff options
| author | ruki <[email protected]> | 2024-12-17 00:41:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-17 00:41:53 +0800 |
| commit | a2ee23e47a174c06ed539e15a0e5b121a61830f2 (patch) | |
| tree | 19126c244aa244cc1c7b9d3dd311f74f0948b8e1 | |
| parent | bd09a63c94cde6fc2e385c83277c52ad355965c1 (diff) | |
| parent | 0b9f428a271054c64eba6fbc745bd00d5b9a4496 (diff) | |
Merge pull request #5980 from Doekin/mingw-clang-targets
Clang: fix target triple for MinGW
| -rw-r--r-- | xmake/toolchains/clang/load.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/toolchains/clang/load.lua b/xmake/toolchains/clang/load.lua index f8bf4eb4f..a3654ed75 100644 --- a/xmake/toolchains/clang/load.lua +++ b/xmake/toolchains/clang/load.lua @@ -55,13 +55,13 @@ function main(toolchain, suffix) if toolchain:is_arch("x86_64", "x64") then target = "x86_64" march = "-m64" - elseif toolchain:is_arch("i386", "x86") then - target = "i386" + elseif toolchain:is_arch("i386", "x86", "i686") then + target = "i686" march = "-m32" - elseif toolchain:is_arch("arm64") then - target = "arm64" + elseif toolchain:is_arch("arm64", "aarch64") then + target = "aarch64" elseif toolchain:is_arch("arm") then - target = "arm" + target = "armv7" end if toolchain:is_plat("windows") then @@ -84,7 +84,7 @@ function main(toolchain, suffix) toolchain:add("shflags", "-fuse-ld=lld-link" .. suffix) end elseif toolchain:is_plat("mingw") then - target = target .. "-windows-gnu" + target = target .. "-w64-windows-gnu" end if target then |