Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch back to clang-11 #89

Merged
merged 1 commit into from
Oct 12, 2024
Merged

switch back to clang-11 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions scripts/base_tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@ as_root apt-get install -y --no-install-recommends \
traceroute \
# end of list

# public key for apt.llvm.org
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | as_root apt-key add -

# for specific llvm/clang versions
echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-12 main" >> /etc/apt/sources.list
as_root apt-get update -q

# Install python dependencies
# Upgrade pip first, then install setuptools (required for other pip packages)
# Install some basic python tools
Expand Down
8 changes: 4 additions & 4 deletions scripts/sel4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ as_root apt-get install -y --no-install-recommends \
qemu-system-x86 \
sloccount \
u-boot-tools \
clang-12 \
clang-11 \
g++-10 \
g++-10-arm-linux-gnueabi \
g++-10-arm-linux-gnueabihf \
Expand All @@ -80,7 +80,7 @@ as_root apt-get install -y --no-install-recommends \
gcc-10-arm-linux-gnueabihf \
gcc-10-base \
gcc-riscv64-unknown-elf \
libclang-12-dev \
libclang-11-dev \
qemu-system-arm \
qemu-system-misc \
$CROSS
Expand Down Expand Up @@ -144,12 +144,12 @@ if [ "$DESKTOP_MACHINE" = "no" ] ; then
done
done

# Ensure that clang-12 shows up as clang
# Ensure that clang-11 shows up as clang
for compiler in clang \
clang++ \
# end of list
do
as_root update-alternatives --install /usr/bin/"$compiler" "$compiler" "$(which "$compiler"-12)" 60 && \
as_root update-alternatives --install /usr/bin/"$compiler" "$compiler" "$(which "$compiler"-11)" 60 && \
as_root update-alternatives --auto "$compiler"
done
# Do a quick check to make sure it works:
Expand Down
Loading