Follow commit 2523af9c557f ("ptxd_make_meson_cross_file: set corect
meson architecture for x86, aarch64 and riscv64"). This fixes the
aarch64 build of vulkan-loader with assembly enabled, which expects
CMAKE_SYSTEM_PROCESSOR to be 'aarch64' [1].

[1] 
https://github.com/KhronosGroup/Vulkan-Loader/blob/afdd025ead2b63b2c73d900ab128a2d3b512cdf0/scripts/parse_asm_values.py#L73

Fixes: 03cf8ff9c4b9 ("vulkan-loader: version bump 1.3.261.0 -> 1.3.261.1")
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
 scripts/lib/ptxd_make_cmake_toolchain.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh 
b/scripts/lib/ptxd_make_cmake_toolchain.sh
index 3d2482e87718..78975ca98652 100644
--- a/scripts/lib/ptxd_make_cmake_toolchain.sh
+++ b/scripts/lib/ptxd_make_cmake_toolchain.sh
@@ -25,6 +25,11 @@ export PTXDIST_CMAKE_TOOLCHAIN_CROSS
 ptxd_make_cmake_toolchain_target() {
     local sysroot_prefix="${PTXDIST_PATH_SYSROOT_PREFIX}:"
 
+    case "${PTXCONF_ARCH_STRING}" in
+       i386) PTXCONF_ARCH_STRING=x86 ;;
+       arm64) PTXCONF_ARCH_STRING=aarch64 ;;
+       riscv) PTXCONF_ARCH_STRING=riscv64 ;;
+    esac
     SYSTEM_NAME="Linux" \
        SYSTEM_VERSION="1" \
        \
-- 
2.39.2


Reply via email to