vlc | branch: master | Steve Lhomme <[email protected]> | Fri May 3 14:28:51 2019 +0200| [4d90c34a81dc18522fb73ffbad56003dc2976cd4] | committer: Steve Lhomme
vlc: allow forcing the tools to use when running bootstrap 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). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d90c34a81dc18522fb73ffbad56003dc2976cd4 --- bootstrap | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index a9f86b6063..b6a4ce682d 100755 --- a/bootstrap +++ b/bootstrap @@ -20,8 +20,11 @@ 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" fi ### _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
