From e48903a9ffff256817c18ebf9af8050163c28240 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 27 Nov 2024 21:37:57 +0100 Subject: [PATCH] meson: honor MESON_ARGS and MESON_HOST_ARGS when calling ninja Set MESON_ARGS and MESON_HOST_ARGS when calling ninja for building. This is required eg. to be able to set PYTHONPATH= not just for the Meson (==configure) run but also for the build phase itself. Signed-off-by: Daniel Golle --- include/meson.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/meson.mk b/include/meson.mk index ff452d8b01f..fdb94b65425 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -108,7 +108,7 @@ define Host/Configure/Meson endef define Host/Compile/Meson - +$(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1) + +$(MESON_HOST_VARS) $(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1) endef define Host/Install/Meson @@ -135,7 +135,7 @@ define Build/Configure/Meson endef define Build/Compile/Meson - +$(NINJA) -C $(MESON_BUILD_DIR) $(1) + +$(MESON_VARS) $(NINJA) -C $(MESON_BUILD_DIR) $(1) endef define Build/Install/Meson