Skip to content
Snippets Groups Projects
Commit a54c2e1c authored by Zhao Zhili's avatar Zhao Zhili Committed by Geoffrey Métais
Browse files

build: build extras/tools before pollute PATH


Build extras/tools/protobuf failed as it tried to pick up clang under
NDK_TOOLCHAIN_PATH.

Signed-off-by: default avatarGeoffrey Métais <geoffrey.metais@gmail.com>
parent 11223205
No related branches found
No related tags found
No related merge requests found
......@@ -62,6 +62,32 @@ if [ -z "$ANDROID_ABI" ]; then
exit 1
fi
# Make in //
if [ -z "$MAKEFLAGS" ]; then
UNAMES=$(uname -s)
MAKEFLAGS=
if which nproc >/dev/null; then
MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" == "Darwin" ] && which sysctl >/dev/null; then
MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi
fi
###########################
# Build buildsystem tools #
###########################
export PATH="`pwd`/vlc/extras/tools/build/bin:$PATH"
echo "Building tools"
cd vlc/extras/tools
./bootstrap
checkfail "buildsystem tools: bootstrap failed"
make $MAKEFLAGS
checkfail "buildsystem tools: make failed"
make $MAKEFLAGS .gas
checkfail "buildsystem tools: make failed"
cd ../../..
###########################
# VLC BOOTSTRAP ARGUMENTS #
###########################
......@@ -339,17 +365,6 @@ echo "ABI: $ANDROID_ABI"
echo "API: $ANDROID_API"
echo "PATH: $PATH"
# Make in //
if [ -z "$MAKEFLAGS" ]; then
UNAMES=$(uname -s)
MAKEFLAGS=
if which nproc >/dev/null; then
MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" == "Darwin" ] && which sysctl >/dev/null; then
MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi
fi
##########
# CFLAGS #
##########
......@@ -423,21 +438,6 @@ echo "VLC_CXXFLAGS: ${VLC_CXXFLAGS}"
cd vlc
###########################
# Build buildsystem tools #
###########################
export PATH="`pwd`/extras/tools/build/bin:$PATH"
echo "Building tools"
cd extras/tools
./bootstrap
checkfail "buildsystem tools: bootstrap failed"
make $MAKEFLAGS
checkfail "buildsystem tools: make failed"
make $MAKEFLAGS .gas
checkfail "buildsystem tools: make failed"
cd ../..
#############
# BOOTSTRAP #
#############
......
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