[vlc-devel] [PATCH 1/2] contrib: Move HOSTVARS_MESON to the right place

[Marvin Scholz]

Previoulsy it would use HOSTTOOLS even though those were not set yet.
---
 contrib/src/main.mak | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 7d701626ba..740bf3e336 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -312,19 +312,6 @@ HOSTCONF += --with-pic
 PIC := -fPIC
 endif
 
-# For cross-compilation with meson, do not set compiler and flags
-# in HOSTVARS as meson will always use them for the BUILD machine compiler!
-MESON_HOST_FLAGS := \
-	CPPFLAGS="$(CPPFLAGS)" \
-	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)" \
-	LDFLAGS="$(LDFLAGS)"
-ifdef HAVE_CROSS_COMPILE
-HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
-else
-HOSTVARS_MESON := $(HOSTTOOLS) $(MESON_HOST_FLAGS)
-endif
-
 # Add these flags after Meson consumed the CFLAGS/CXXFLAGS
 ifndef WITH_OPTIMIZATION
 CFLAGS := $(CFLAGS) -g -O0
@@ -349,6 +336,19 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
 	CXXFLAGS="$(CXXFLAGS) $(PIC)" \
 	LDFLAGS="$(LDFLAGS)"
 
+# For cross-compilation with meson, do not set compiler and flags
+# in HOSTVARS as meson will always use them for the BUILD machine compiler!
+MESON_HOST_FLAGS := \
+	CPPFLAGS="$(CPPFLAGS)" \
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
+ifdef HAVE_CROSS_COMPILE
+HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
+else
+HOSTVARS_MESON := $(HOSTTOOLS) $(MESON_HOST_FLAGS)
+endif
+
 download_git = \
 	rm -Rf -- "$(@:.tar.xz=)" && \
 	$(GIT) init --bare "$(@:.tar.xz=)" && \
-- 
2.20.1 (Apple Git-117)