diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-03-16 16:18:07 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-09 15:56:04 +0200 |
| commit | 19f3fcc884cab348cfba823f1175baf7aa4de15f (patch) | |
| tree | b540c8cddc4bd0a32567e06b7305d841b5264106 /include | |
| parent | 56f091d4677feb693d37959a3fa4af845dcce82e (diff) | |
| download | upstream-19f3fcc884cab348cfba823f1175baf7aa4de15f.tar.gz upstream-19f3fcc884cab348cfba823f1175baf7aa4de15f.tar.bz2 upstream-19f3fcc884cab348cfba823f1175baf7aa4de15f.zip | |
tools/meson: update to 0.61.4
Override python to use the one in host instead of hostpkg. There's no
need to use the latter.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/meson.mk b/include/meson.mk index 102e74b542..7d67dcf298 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -65,6 +65,7 @@ define Meson/CreateNativeFile -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \ + -e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \ @@ -82,6 +83,7 @@ define Meson/CreateCrossFile -e "s|@NM@|$(TARGET_NM)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \ + -e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \ |