[vlc-devel] [PATCH 2/3] contrib: Add support for cross compilation with meson

[Rémi Denis-Courmont]

Le tiistaina 25. syyskuuta 2018, 19.11.06 EEST Hugo Beauzée-Luyssen a écrit :
> ---
>  contrib/src/main.mak | 36 +++++++++++++++++++++++++++++++++++-
>  1 file changed, 35 insertions(+), 1 deletion(-)
> 
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 0f8b51088f..71972fc896 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -286,7 +286,7 @@ HOSTTOOLS := \
>  	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
>  	AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
>  	PATH="$(PREFIX)/bin:$(PATH)"
> -HOSTVARS := $(HOSTTOOLS) \
> +HOSTVARS := \
>  	CPPFLAGS="$(CPPFLAGS)" \
>  	CFLAGS="$(CFLAGS)" \
>  	CXXFLAGS="$(CXXFLAGS)" \
> @@ -297,6 +297,11 @@ 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_NOTOOLS := $(HOSTVARS)
> +HOSTVARS := $(HOSTTOOLS) $(HOSTVARS)

Can we please have something less kludgy?

-- 
雷米‧德尼-库尔蒙
http://www.remlab.net/