Commit 4aacc255 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

libvlc: update build script as the FORCED_TOOLS semantic has changed

Using the same as in build.sh now.
parent ae4b8810
Pipeline #19142 passed with stage
in 11 minutes and 41 seconds
......@@ -119,12 +119,12 @@ cd extras/tools
export PATH="$PWD/build/bin":"$PATH"
# Force patched meson as newer versions don't add -lpthread properly in libplacebo.pc
FORCED_TOOLS=".meson"
FORCED_TOOLS="meson"
if [ "${HAS_CLANG}" = "1" ] ; then
# We need a patched version of libtool & cmake, regardless of which
# version is installed on the system.
# cmake can go away when we switch to 3.13.0
FORCED_TOOLS="$FORCED_TOOLS .cmake .libtool"
FORCED_TOOLS="$FORCED_TOOLS libtool"
fi
NEEDED="$FORCED_TOOLS" ./bootstrap && make $MAKEFLAGS
cd ../../
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment