Skip to content

Commit

Permalink
ansible,jenkins: revert to default gcc-12 on debian12 (#3845)
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Aug 6, 2024
1 parent 76f9ad5 commit c806876
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ packages: {
],

debian12: [
'systemd-timesyncd,gcc,g++,gcc-11,g++-11,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv',
'systemd-timesyncd,gcc,g++,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv',
],

fedora: [
Expand Down
6 changes: 0 additions & 6 deletions jenkins/scripts/select-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
fi
echo "Compiler set to GCC" `$CXX -dumpversion`
;;
debian12-x64 )
export CC="ccache gcc-11"
export CXX="ccache g++-11"
export LINK="g++-11"
echo "Compiler set to GCC" `$CXX -dumpversion`
;;
esac

elif [ "$SELECT_ARCH" = "ARM64" ]; then
Expand Down

0 comments on commit c806876

Please sign in to comment.