Skip to content

Commit 214002c

Browse files
committed
Fixed linux builds on 5.5 #81 by edowson
1 parent d0f06e8 commit 214002c

2 files changed

Lines changed: 25 additions & 7 deletions

File tree

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ if [ "$(uname)" == "Darwin" ]; then
6464
export CXX="$(brew --prefix)/opt/llvm/bin/clang++"
6565
else
6666
if $gcc; then
67-
export CC="gcc-12"
68-
export CXX="g++-12"
67+
export CC="gcc"
68+
export CXX="g++"
6969
else
70-
export CC="clang-12"
71-
export CXX="clang++-12"
70+
export CC="clang"
71+
export CXX="clang++"
7272
fi
7373
fi
7474

setup.sh

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,25 @@ else #linux
4848
# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
4949
# sudo apt-get update
5050
# fi
51-
sudo apt-get install -y clang-12 clang++-12 libc++-12-dev libc++abi-12-dev libstdc++-12-dev
51+
if [ "$VERSION" -eq "20" ]; then
52+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
53+
sudo apt update
54+
sudo apt-get install -y build-essential cmake clang clang-12 clang++-12 libc++-12-dev libc++abi-12-dev libstdc++-13-dev
55+
56+
# configure update-alternatives for clang
57+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 1000
58+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 1000
59+
sudo update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-12 1000
60+
sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang++-12 1000
61+
fi
62+
if [ "$VERSION" -eq "22" ]; then
63+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
64+
sudo apt update
65+
sudo apt-get install -y build-essential cmake clang clang-14 clang++-14 libc++-14-dev libc++abi-14-dev libstdc++-13-dev
66+
fi
67+
if [ "$VERSION" -eq "24" ]; then
68+
sudo apt-get install -y build-essential cmake clang clang-18 clang++-18 libc++-18-dev libc++abi-18-dev libstdc++-13-dev
69+
fi
5270
fi
5371

5472
if ! which cmake; then
@@ -86,7 +104,7 @@ else #linux
86104
fi
87105

88106
# install additional tools
89-
sudo apt-get install -y build-essential unzip libunwind-dev
107+
sudo apt-get install -y unzip
90108

91109
if version_less_than_equal_to $cmake_ver $MIN_CMAKE_VERSION; then
92110
# in ubuntu 18 docker CI, avoid building cmake from scratch to save time
@@ -190,4 +208,4 @@ set +x
190208
echo ""
191209
echo "******************************************"
192210
echo "Cosys-AirSim setup completed successfully!"
193-
echo "******************************************"
211+
echo "******************************************"

0 commit comments

Comments
 (0)