diff options
| author | ruki <[email protected]> | 2023-06-12 23:42:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-12 23:42:53 +0800 |
| commit | f7d35cbf580235d58bc717c853524b96a7bd4f1a (patch) | |
| tree | 5614f24c64f1031c04441f146424c0f1087b37ab | |
| parent | c0343e58792f98e5b317d8229972a145cdaada55 (diff) | |
| parent | 0b83eee8f989b19e2431413a3242046702aa8367 (diff) | |
Merge pull request #3835 from Arthapz/meson-support-custom-plat
fix cross file cpu / system / endianess generation when using a custom plat and allow aarch54 arch as a equivalent to arm64
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index f1a1c405e..c8029b4dc 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -251,9 +251,9 @@ function _get_cross_file(package, opt) file:print("cpu_family = 'wasm32'") file:print("cpu = 'wasm32'") file:print("endian = 'little'") - elseif package:is_plat("cross") and package:targetos() then + else local cpu = package:arch() - if package:is_arch("arm64") then + if package:is_arch("arm64") or package:is_arch("aarch64") then cpu = "aarch64" elseif package:is_arch("arm.*") then cpu = "arm" |