mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-09 17:38:32 -04:00
ci: remove clang temporarily from APT packages
This commit is contained in:
parent
50527f6088
commit
501284f65a
@ -4,7 +4,7 @@
|
|||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
PKGS="build-essential gawk ccache genromfs libc6-i386 \
|
PKGS="build-essential gawk ccache genromfs libc6-i386 \
|
||||||
python-dev python-pip zlib1g-dev gcc-4.9 g++-4.9 cmake cmake-data clang-3.7 llvm-3.7"
|
python-dev python-pip zlib1g-dev gcc-4.9 g++-4.9 cmake cmake-data" # clang-3.7 llvm-3.7"
|
||||||
|
|
||||||
read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)
|
read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)
|
||||||
|
|
||||||
@ -16,8 +16,8 @@ elif [ "$UBUNTU_CODENAME" = "trusty" ]; then
|
|||||||
sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
|
sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wget -q -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
|
#wget -q -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||||
sudo add-apt-repository "deb http://llvm.org/apt/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-3.7 main" -y
|
#sudo add-apt-repository "deb http://llvm.org/apt/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-3.7 main" -y
|
||||||
sudo apt-get -qq -y --force-yes update
|
sudo apt-get -qq -y --force-yes update
|
||||||
sudo apt-get -qq -y --force-yes remove clang llvm
|
sudo apt-get -qq -y --force-yes remove clang llvm
|
||||||
sudo apt-get -y --force-yes install $PKGS
|
sudo apt-get -y --force-yes install $PKGS
|
Loading…
Reference in New Issue
Block a user