[openwrt/openwrt] meson: honor MESON_ARGS and MESON_HOST_ARGS when calling ninja
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 28 07:55:12 PST 2024
dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e48903a9ffff256817c18ebf9af8050163c28240
commit e48903a9ffff256817c18ebf9af8050163c28240
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Wed Nov 27 21:37:57 2024 +0100
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 at makrotopia.org>
---
include/meson.mk | 4 ++--
1 file 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
More information about the lede-commits
mailing list