[vlc-devel] [PATCH 2/2] vlc: allow forcing the tools to use when running bootstrap

[Steve Lhomme]

On 2019-05-27 10:01, Steve Lhomme wrote:
> On Windows it's possible to build VLC in either msys2 or WSL. But the tools are
> shared and incompatible. Only one at a time is currently possible. This will
> allow switching back and forth without rebuilding tools all the time
> (especially since they are detected as built).
> ---
>   bootstrap | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/bootstrap b/bootstrap
> index a9f86b6063..855dda8a7d 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -20,8 +20,12 @@ fi
>   ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
>   
>   # Check for tools directory
> -if test -d extras/tools/build/bin; then
> -  PATH="`pwd`/extras/tools/build/bin:$PATH"
> +if test -z ${VLC_TOOLS}; then
> +  VLC_TOOLS=extras/tools/build
> +fi
> +if test -d ${VLC_TOOLS}/bin; then
> +  PATH="`realpath ${VLC_TOOLS}`/bin:$PATH"
> +  echo setting PATH=$PATH

Without the echo

>   fi
>   
>   ###
> -- 
> 2.17.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>