Skip to content

Commit 2e2a3b8

Browse files
committed
ci: skip installing llvm for android
1 parent f40a845 commit 2e2a3b8

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

ci-before-build.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ if [[ "$TARGET_OS" == mac* || "$TARGET_OS" == iOS* || "$TARGET_OS" == android ]]
1212
FF_EXTRA=
1313
fi
1414
if [ `which dpkg` ]; then # TODO: multi arch
15+
pkgs="sshpass cmake ninja-build p7zip-full"
1516
#wget https://apt.llvm.org/llvm.sh
16-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key |sudo apt-key add -
17-
#sudo apt update
18-
#sudo apt install -y software-properties-common # for add-apt-repository, ubuntu-tooolchain-r-test is required by trusty
19-
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-8 main" # rpi
20-
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"
21-
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" # clang-13
22-
sudo apt update
23-
pkgs="sshpass cmake ninja-build p7zip-full lld-$LLVER clang-tools-$LLVER" # clang-tools: clang-cl
17+
if [[ "$TARGET_OS" != android ]]; then
18+
pkgs+=" lld-$LLVER clang-tools-$LLVER" # clang-tools: clang-cl
19+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key |sudo apt-key add -
20+
#sudo apt update
21+
#sudo apt install -y software-properties-common # for add-apt-repository, ubuntu-tooolchain-r-test is required by trusty
22+
#sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-8 main" # rpi
23+
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"
24+
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" # clang-13
25+
sudo apt update
26+
fi
2427
if [ "$TARGET_OS" == "linux" ]; then
2528
pkgs+=" libc++-$LLVER-dev libc++abi-$LLVER-dev libegl1-mesa-dev libgles2-mesa-dev libgl1-mesa-dev libgbm-dev libx11-dev libwayland-dev libasound2-dev libopenal-dev libpulse-dev libva-dev libvdpau-dev libglfw3-dev libsdl2-dev"
2629
elif [ "$TARGET_OS" == "sunxi" -o "$TARGET_OS" == "raspberry-pi" ]; then

0 commit comments

Comments
 (0)