Merge pull request xmake-io#5980 from Doekin/mingw-clang-targets

Clang: fix target triple for MinGW
Doekin · Dec 16, 2024 · a2ee23e · a2ee23e
2 parents bd09a63 + 0b9f428
commit a2ee23e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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