From 1357190186c3f304945e99b9dc11e07330f2fcbe Mon Sep 17 00:00:00 2001 From: iFarbod Date: Sat, 21 Dec 2024 04:59:33 +0330 Subject: Add ARM target support for Windows in clang-cl toolchain --- xmake/toolchains/clang-cl/load.lua | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/xmake/toolchains/clang-cl/load.lua b/xmake/toolchains/clang-cl/load.lua index 3763b8d2e..11c4581f7 100644 --- a/xmake/toolchains/clang-cl/load.lua +++ b/xmake/toolchains/clang-cl/load.lua @@ -75,16 +75,27 @@ function main(toolchain) end end - local march + local target if toolchain:is_arch("x86_64", "x64") then + target = "x86_64-pc" march = "-m64" - elseif toolchain:is_arch("i386", "x86") then + elseif toolchain:is_arch("i386", "x86", "i686") then + target = "i686-pc" march = "-m32" + elseif toolchain:is_arch("arm64", "aarch64") then + target = "aarch64" + elseif toolchain:is_arch("arm64ec") then + target = "arm64ec" + elseif toolchain:is_arch("arm") then + target = "armv7" end - if march then - toolchain:add("cxflags", march) - toolchain:add("mxflags", march) - toolchain:add("asflags", march) + + target = target .. "-windows-msvc" + + if target then + toolchain:add("cxflags", "--target=" .. target) + toolchain:add("mxflags", "--target=" .. target) + toolchain:add("asflags", "--target=" .. target) end end -- cgit v1.3.1 From 0a381cb3638bde102c8ce45d7a6f669b86ffd0bd Mon Sep 17 00:00:00 2001 From: iFarbod Date: Sat, 21 Dec 2024 05:36:52 +0330 Subject: Remove empty lines --- xmake/toolchains/clang-cl/load.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmake/toolchains/clang-cl/load.lua b/xmake/toolchains/clang-cl/load.lua index 11c4581f7..f73499118 100644 --- a/xmake/toolchains/clang-cl/load.lua +++ b/xmake/toolchains/clang-cl/load.lua @@ -78,10 +78,8 @@ function main(toolchain) local target if toolchain:is_arch("x86_64", "x64") then target = "x86_64-pc" - march = "-m64" elseif toolchain:is_arch("i386", "x86", "i686") then target = "i686-pc" - march = "-m32" elseif toolchain:is_arch("arm64", "aarch64") then target = "aarch64" elseif toolchain:is_arch("arm64ec") then @@ -91,7 +89,6 @@ function main(toolchain) end target = target .. "-windows-msvc" - if target then toolchain:add("cxflags", "--target=" .. target) toolchain:add("mxflags", "--target=" .. target) -- cgit v1.3.1