summaryrefslogtreecommitdiff
path: root/xmake/modules
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-08 23:00:53 +0800
committerruki <[email protected]>2024-07-08 23:00:53 +0800
commit8a9a8a2bee6db0730d6e376e0114a3430ceba063 (patch)
treeb7333d11f472013bdc10b68cfd64462ffb07e6d4 /xmake/modules
parentb42d338164895297339e94792faf2da4418f1e88 (diff)
enable arm64ec for tools.cmake again
Diffstat (limited to 'xmake/modules')
-rw-r--r--xmake/modules/package/tools/meson.lua2
-rw-r--r--xmake/modules/private/action/trybuild/cmake.lua3
2 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index 2a2b248cf..fae75af6e 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -153,7 +153,7 @@ function _insert_cross_configs(package, file, opt)
elseif package:is_plat("windows") then
local cpu
local cpu_family
- if package:is_arch("arm64") then
+ if package:is_arch("arm64", "arm64ec") then
cpu = "aarch64"
cpu_family = "aarch64"
elseif package:is_arch("x86") then
diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua
index 94df5a450..c976e4bd5 100644
--- a/xmake/modules/private/action/trybuild/cmake.lua
+++ b/xmake/modules/private/action/trybuild/cmake.lua
@@ -110,7 +110,8 @@ function _get_cmake_system_processor()
x64 = "AMD64",
x86_64 = "AMD64",
arm = "ARM",
- arm64 = "ARM64"
+ arm64 = "ARM64",
+ arm64ec = "ARM64EC"
}
return archs[os.subarch()] or os.subarch()
end