[vlc-devel] [PATCH] contrib: Simplify HOSTVARS assignment

[Hugo Beauzée-Luyssen]

On Wed, Jun 19, 2019, at 12:14 PM, Marvin Scholz wrote:
> 
> 
> On 19 Jun 2019, at 12:06, Hugo Beauzée-Luyssen wrote:
> 
> > On Wed, Jun 19, 2019, at 11:44 AM, Marvin Scholz wrote:
> >> ---
> >>  contrib/src/main.mak | 6 ++----
> >>  1 file changed, 2 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> >> index 2062f5f5c2..c8984433bc 100644
> >> --- a/contrib/src/main.mak
> >> +++ b/contrib/src/main.mak
> >> @@ -318,7 +318,7 @@ HOSTTOOLS := \
> >>  	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
> >>  	AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
> >>  	PATH="$(PREFIX)/bin:$(PATH)"
> >> -HOSTVARS := \
> >> +HOSTVARS := $(HOSTTOOLS) \
> >>  	CPPFLAGS="$(CPPFLAGS)" \
> >>  	CFLAGS="$(CFLAGS)" \
> >>  	CXXFLAGS="$(CXXFLAGS)" \
> >> @@ -334,11 +334,9 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
> >>  ifdef HAVE_CROSS_COMPILE
> >>  HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
> >>  else
> >> -HOSTVARS_MESON := $(HOSTTOOLS) $(HOSTVARS)
> >> +HOSTVARS_MESON := $(HOSTVARS)
> >>  endif
> >>
> >> -HOSTVARS := $(HOSTTOOLS) $(HOSTVARS)
> >> -
> >>  download_git = \
> >>  	rm -Rf -- "$(@:.tar.xz=)" && \
> >>  	$(GIT) init --bare "$(@:.tar.xz=)" && \
> >
> > Doesn't this break cross compilation with meson by passing a cross 
> > compiler as CC, instead of the native one?
> >
> 
> The
> 
> ifdef HAVE_CROSS_COMPILE
>   HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
> else …
> 
> is still there, so that should not happen?
> 
> I only set HOSTVARS_MESON to HOSTVARS for the non-cross
> case so it should not matter that for cross, HOSTVARS have
> the tools too.
> 

Oh indeed, my bad!

LGTM then :)

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr