From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] ptxd_make_cmake_toolchain: set correct CMAKE_SYSTEM_PROCESSOR for x86, aarch64 and riscv64
Date: Mon, 4 Sep 2023 11:39:52 +0200 [thread overview]
Message-ID: <20230904093952.370935-1-p.zabel@pengutronix.de> (raw)
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.zabel@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
next reply other threads:[~2023-09-04 9:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 9:39 Philipp Zabel [this message]
2023-09-08 8:17 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230904093952.370935-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox