summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle2024-11-27 20:37:57 +0000
committerDaniel Golle2024-11-28 15:53:32 +0000
commite48903a9ffff256817c18ebf9af8050163c28240 (patch)
tree8a40c0f3a0157b9a7f9ce74b445fa692141e828a
parentee9eb91e0a69aa90c69cd34efef44badbc16d416 (diff)
downloadopenwrt-e48903a9ffff256817c18ebf9af8050163c28240.tar.gz
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 <daniel@makrotopia.org>
-rw-r--r--include/meson.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/meson.mk b/include/meson.mk
index ff452d8b01..fdb94b6542 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