From: Rosen Penev Date: Sat, 9 Oct 2021 19:24:44 +0000 (-0700) Subject: tools/meson: fix usage with SDK X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7c0fb874436c0613a042c8b07aa00621d08f4eaa;p=openwrt%2Fstaging%2Fblogic.git tools/meson: fix usage with SDK The python path cannot be embedded in the meson binary as it changes with the SDK. Signed-off-by: Rosen Penev --- diff --git a/include/meson.mk b/include/meson.mk index 9862f0e662b7..12e38b9e71e0 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -56,7 +56,7 @@ MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))" endif define Meson - $(2) $(STAGING_DIR_HOST)/bin/meson $(1) + $(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(STAGING_DIR_HOST)/bin/meson $(1) endef define Meson/CreateNativeFile diff --git a/tools/meson/Makefile b/tools/meson/Makefile index 0cf0efba4726..1aab5d8fcb1e 100644 --- a/tools/meson/Makefile +++ b/tools/meson/Makefile @@ -21,7 +21,7 @@ endef define Host/Install $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(HOST_BUILD_DIR)/packaging/create_zipapp.py $(HOST_BUILD_DIR) --interpreter $(STAGING_DIR_HOST)/bin/$(PYTHON) --outfile $(STAGING_DIR_HOST)/bin/meson + $(HOST_BUILD_DIR)/packaging/create_zipapp.py $(HOST_BUILD_DIR) --outfile $(STAGING_DIR_HOST)/bin/meson $(INSTALL_DIR) $(STAGING_DIR_HOST)/lib/meson $(INSTALL_CONF) files/openwrt-cross.txt.in $(STAGING_DIR_HOST)/lib/meson/ $(INSTALL_CONF) files/openwrt-native.txt.in $(STAGING_DIR_HOST)/lib/meson/