Skip to content
Snippets Groups Projects
Commit 29ac1277 authored by Steve Lhomme's avatar Steve Lhomme Committed by Hugo Beauzée-Luyssen
Browse files

extras: build native tools when using prebuilt contribs

Rather than force building .luac and .protoc all the time.
parent 8110ae9c
No related branches found
No related tags found
1 merge request!1465contrib: add a build target to build native tools
Pipeline #198362 passed with stage
in 15 minutes and 37 seconds
...@@ -242,7 +242,7 @@ debian: ...@@ -242,7 +242,7 @@ debian:
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL" echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}" make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}"
make -j$NCPU --output-sync=recurse .protoc make -j$NCPU --output-sync=recurse tools
else else
make list make list
make -j$NCPU --output-sync=recurse fetch make -j$NCPU --output-sync=recurse fetch
......
...@@ -183,7 +183,7 @@ if [ ! -e "../$HOST_TRIPLET" ]; then ...@@ -183,7 +183,7 @@ if [ ! -e "../$HOST_TRIPLET" ]; then
else else
make prebuilt make prebuilt
fi fi
make .luac .protoc make -j$JOBS tools
fi fi
fi fi
spopd spopd
......
...@@ -130,10 +130,10 @@ if [ "$PREBUILT" != "yes" ]; then ...@@ -130,10 +130,10 @@ if [ "$PREBUILT" != "yes" ]; then
fi fi
elif [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then elif [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
make -j$JOBS --output-sync=recurse .luac .protoc make -j$JOBS --output-sync=recurse tools
else else
make prebuilt make prebuilt
make -j$JOBS --output-sync=recurse .luac .protoc make -j$JOBS --output-sync=recurse tools
fi fi
cd ../.. cd ../..
......
...@@ -82,7 +82,7 @@ parts: ...@@ -82,7 +82,7 @@ parts:
--disable-chromaprint --disable-chromaprint
if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then
make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
make -j $(getconf _NPROCESSORS_ONLN) .protoc make -j $(getconf _NPROCESSORS_ONLN) tools
else else
make list make list
make -j $(getconf _NPROCESSORS_ONLN) fetch make -j $(getconf _NPROCESSORS_ONLN) fetch
......
...@@ -333,7 +333,7 @@ else ...@@ -333,7 +333,7 @@ else
else else
make prebuilt make prebuilt
fi fi
make .luac .protoc make -j$JOBS tools
fi fi
cd ../.. cd ../..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment