From 8d70c35a3d216f0696aa873244154859e1e11e4c Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Tue, 23 Nov 2021 19:17:59 +0100 Subject: [PATCH] scripts/build: load meson host conf as native file --- scripts/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build b/scripts/build index 4ec0891c94..2fc8a94ddf 100755 --- a/scripts/build +++ b/scripts/build @@ -264,8 +264,8 @@ else ;; "meson:host") create_meson_conf_host ${TARGET} ${MESON_CONF} - echo "Executing (host): meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " " - meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*} + echo "Executing (host): meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " " + meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*} ;; "meson:init") create_meson_conf_target ${TARGET} ${MESON_CONF} @@ -274,8 +274,8 @@ else ;; "meson:bootstrap") create_meson_conf_host ${TARGET} ${MESON_CONF} - echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " " - meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*} + echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} ----native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " " + meson ${BOOTSTRAP_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*} ;; # cmake builds with ninja