summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-09-11 08:22:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-11 08:22:36 +0200
commitc41c1422c2f39060dc22991d13fb3fbe4054af6a (patch)
tree0be0657fde2bfb5f8fe0907a4573c35659eaa634 /scripts
parentd60fe3822c4cbfcffee8664177fe76f85ba16cca (diff)
downloadptxdist-c41c1422c2f39060dc22991d13fb3fbe4054af6a.tar.gz
ptxdist-c41c1422c2f39060dc22991d13fb3fbe4054af6a.tar.xz
ptxd_make_meson_cross_file: use ptxd_get_alternative to allow a custom cross-file.meson
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/ptxd_make_meson_toolchain.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_meson_toolchain.sh b/scripts/lib/ptxd_make_meson_toolchain.sh
index eda82d64b..f194c0e6c 100644
--- a/scripts/lib/ptxd_make_meson_toolchain.sh
+++ b/scripts/lib/ptxd_make_meson_toolchain.sh
@@ -15,7 +15,9 @@ export PTXDIST_MESON_CROSS_FILE
# $1: meson cross file
#
ptxd_make_meson_cross_file() {
+ local ptxd_reply
+ 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 "${PTXDIST_TOPDIR}/config/meson/cross-file.meson.in" > "${1}"
+ ptxd_replace_magic "${ptxd_reply}" > "${1}"
}
export -f ptxd_make_meson_cross_file