[vlc-devel] [PATCH v4 8/9] contrib: not pass HOSTVARS to meson when cross-compiling

[Marvin Scholz]

Meson always interprets these env variables for the build
compiler, even when cross-compiling.
---
 contrib/src/main.mak | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 18d26bbc9d..a1be81cacf 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -329,9 +329,14 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
 	CXXFLAGS="$(CXXFLAGS) $(PIC)" \
 	LDFLAGS="$(LDFLAGS)"
 
-# Keep a version of HOSTVARS without the tools, since meson requires the
-# tools variables to point to the native ones
-HOSTVARS_MESON := $(HOSTVARS)
+# For cross-compilation with meson, do not set compiler and flags
+# in HOSTVARS as meson will always use them for the BUILD machine compiler!
+ifdef HAVE_CROSS_COMPILE
+HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
+else
+HOSTVARS_MESON := $(HOSTTOOLS) $(HOSTVARS)
+endif
+
 HOSTVARS := $(HOSTTOOLS) $(HOSTVARS)
 
 download_git = \
-- 
2.20.1 (Apple Git-117)