[vlc-commits] package/win32: build.sh: set VLC_TOOLS to the path we built them

Steve Lhomme git at videolan.org
Thu Jun 18 14:54:26 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Mar  2 09:17:22 2020 +0100| [c16f00a01209f14ce47c5a4105c3ce9d3eb56d57] | committer: Steve Lhomme

package/win32: build.sh: set VLC_TOOLS to the path we built them

By default it will be $(TOPSRC)/../extras/tools/build which is not correct when
building out of tree for Windows. Because when building for Windows there's a
possibility the same source tree is built from within msys2 or WSL. They can't
share the tools.

(cherry picked from commit 4166b6483c9975b3181eae475b44d28482c94446)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 extras/package/win32/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index add87cb9ec..893a4fa050 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -113,6 +113,7 @@ fi
 info "Building extra tools"
 mkdir -p extras/tools
 cd extras/tools
+export VLC_TOOLS="$PWD/build"
 
 export PATH="$PWD/build/bin":"$PATH"
 # Force patched meson as newer versions don't add -lpthread properly in libplacebo.pc



More information about the vlc-commits mailing list