summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-02-05 08:45:53 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-02-05 08:45:53 +0100
commit2523af9c557f43fc92555c09d9eed866e81b795f (patch)
tree7cf1220deb118b617f2cdb9800c9620c731f417c /scripts
parentd169ec5a93bf4749f863e6bbbc1512fdf2255b32 (diff)
downloadptxdist-2523af9c557f43fc92555c09d9eed866e81b795f.tar.gz
ptxdist-2523af9c557f43fc92555c09d9eed866e81b795f.tar.xz
ptxd_make_meson_cross_file: set corect meson architecture for x86, aarch64 and riscv64
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/ptxd_make_meson_toolchain.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_meson_toolchain.sh b/scripts/lib/ptxd_make_meson_toolchain.sh
index f194c0e6c..3984469bb 100644
--- a/scripts/lib/ptxd_make_meson_toolchain.sh
+++ b/scripts/lib/ptxd_make_meson_toolchain.sh
@@ -16,6 +16,11 @@ export PTXDIST_MESON_CROSS_FILE
#
ptxd_make_meson_cross_file() {
local ptxd_reply
+ case "${PTXCONF_ARCH_STRING}" in
+ i386) PTXCONF_ARCH_STRING=x86 ;;
+ arm64) PTXCONF_ARCH_STRING=aarch64 ;;
+ riscv) PTXCONF_ARCH_STRING=riscv64 ;;
+ esac
ptxd_get_alternative config meson/cross-file.meson.in &&
CPU="$(ptxd_cross_cc_v | sed -n -e "s/.*'-march=\([^']*\).*/\1/p" -e "/-march=/q")" \
ptxd_replace_magic "${ptxd_reply}" > "${1}"