Skip to content

chore: update (gcc,clang) to (14,20); add flang #88

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

Open
wdconinc wants to merge 6 commits into
base: master
Choose a base branch
from
+11 −7
Open

chore: update (gcc,clang) to (14,20); add flang #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d033ab
chore: update gcc,clang to 14,20
wdconinc Dec 14, 2025
de4492c
fix: typo
wdconinc Dec 14, 2025
4019e7c
feat: add flang
wdconinc Dec 14, 2025
3102e4c
chore: iwyu-0.24
wdconinc Dec 14, 2025
36e1e23
fix: add flang to update-alternatives
wdconinc Dec 14, 2025
3cff82d
fix: cuda +allow-unsupported-compilers
wdconinc Dec 18, 2025
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
10 changes: 4 additions & 6 deletions containers/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,13 @@ mkdir -p /etc/apt/source.list.d
case ${ID} in
debian)
case ${VERSION_CODENAME} in
bookworm) GCC="-12" ; CLANG="-18" ;;
trixie) GCC="-14" ; CLANG="-19" ;;
trixie) GCC="-14" ; CLANG="-20" ;;
*) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
esac ;;
ubuntu)
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
case ${VERSION_CODENAME} in
focal) GCC="-10" ; CLANG="-16" ;;
jammy) GCC="-12" ; CLANG="-16" ;;
noble) GCC="-13" ; CLANG="-17" ;;
noble) GCC="-14" ; CLANG="-20" ;;
*) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
esac ;;
*) echo "Unsupported ID=${ID}" ; exit 1 ;;
Expand All @@ -109,7 +106,7 @@ fi
# Install packages
apt-get -yqq update
apt-get -yqq install cpp${GCC} gcc${GCC} g++${GCC} gfortran${GCC}
apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev
apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev flang${CLANG}
apt-get -yqq autoremove
# Remove symlinks loop in nvidia/cuda:12.5.1-devel-ubuntu24.04
rm -f /usr/bin/cpp /etc/alternatives/cpp
Expand All @@ -120,6 +117,7 @@ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++${GCC} 100
update-alternatives --install /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar${GCC} 100
update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran${GCC} 100
update-alternatives --install /usr/bin/clang clang /usr/bin/clang${CLANG} 100
update-alternatives --install /usr/bin/flang flang /usr/bin/flang${CLANG} 100
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++${CLANG} 100
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format${CLANG} 100
update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff${CLANG} 100
Expand Down
8 changes: 7 additions & 1 deletion spack-environment/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ packages:
cppcoro:
require:
- '@10bbcdbf2be3ad3aa56febcf4c7662d771460a99'
cuda:
require:
# We disable CUDA's maximum supported compiler versions, e.g.:
# conflicts("%clang@20:", when="+cuda ^cuda@:12.9")
# https://github.com/spack/spack-packages/blob/develop/repos/spack_repo/builtin/build_systems/cuda.py
- +allow-unsupported-compilers
dawn:
require:
- '@3_91a'
Expand Down Expand Up @@ -242,7 +248,7 @@ packages:
- '@2.1.0'
iwyu:
require:
- '@0.23'
- '@0.24'
jana2:
require:
- '@2.4.3'
Expand Down
Loading