[vlc-commits] contrib: always set MESON_HOST_FLAGS to the host flags

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jul 24 13:09:45 2019 +0200| [7a2d3fe1d1d0937f7c06415892a7efe275748428] | committer: Steve Lhomme

contrib: always set MESON_HOST_FLAGS to the host flags

It was empty in cross compilation and then used to set values in the crossfile.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a2d3fe1d1d0937f7c06415892a7efe275748428
---

 contrib/src/main.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index fae0feb9fd..7eef7b85b6 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -307,14 +307,14 @@ 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!
-ifdef HAVE_CROSS_COMPILE
-HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
-else
 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