Skip to content

Commit

Permalink
ansible,jenkins: install and select gcc-10 on debian10
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Sep 22, 2023
1 parent 660f914 commit afca781
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ packages: {
],

debian10: [
'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
'gcc-8,g++-8,gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
],

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

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

0 comments on commit afca781

Please sign in to comment.