Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression from Ubuntu 20.04 support

Browse Source
This commit is contained in:
Jordan Carlin 2024-06-29 13:38:34 -07:00
parent c8a110d523
commit 7d0a21693c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/wally-tool-chain-install.sh
View File

@ -164,7 +164,7 @@ elif [ "$FAMILY" = ubuntu ]; then
sudo apt install -y mold sudo apt install -y mold
fi fi
# Newer version of gcc needed for Ubuntu 20.04 for Verilator # Newer version of gcc needed for Ubuntu 20.04 for Verilator
if (( UBUNTU_VERSION < 22 )); then if [ "$UBUNTU_VERSION" = 20 ]; then
sudo apt install -y gcc-10 g++-10 cpp-10 sudo apt install -y gcc-10 g++-10 cpp-10
mkdir -p "$RISCV"/gcc-10/bin mkdir -p "$RISCV"/gcc-10/bin
for f in gcc cpp g++ gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool lto-dump; do for f in gcc cpp g++ gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool lto-dump; do
@ -204,7 +204,7 @@ fi
source "$RISCV"/riscv-python/bin/activate # reload python virtual environment source "$RISCV"/riscv-python/bin/activate # reload python virtual environment
# Extra dependecies needed for older distros that don't have new enough versions available from package manager # Extra dependecies needed for older distros that don't have new enough versions available from package manager
if [ "$RHEL_VERSION" = 8 ] || (( UBUNTU_VERSION < 22 )); then if [ "$RHEL_VERSION" = 8 ] || [ "$UBUNTU_VERSION" = 20 ]; then
# Newer versin of glib required for Qemu. # Newer versin of glib required for Qemu.
# Anything newer than this won't build on red hat 8 # Anything newer than this won't build on red hat 8
if [ ! -e "$RISCV"/include/glib-2.0 ]; then if [ ! -e "$RISCV"/include/glib-2.0 ]; then
@ -427,7 +427,7 @@ if [ ! -e "${RISCV}"/site-setup.sh ]; then
wget https://raw.githubusercontent.com/openhwgroup/cvw/main/site-setup.csh wget https://raw.githubusercontent.com/openhwgroup/cvw/main/site-setup.csh
if [ "$FAMILY" = rhel ]; then if [ "$FAMILY" = rhel ]; then
echo "source /opt/rh/gcc-toolset-13/enable" >> site-setup.sh echo "source /opt/rh/gcc-toolset-13/enable" >> site-setup.sh
elif (( UBUNTU_VERSION < 22 )); then elif [ "$UBUNTU_VERSION" = 20 ]; then
echo "export PATH=\$RISCV/gcc-10/bin:\$PATH" >> site-setup.sh echo "export PATH=\$RISCV/gcc-10/bin:\$PATH" >> site-setup.sh
echo "prepend PATH \$RISCV/gcc-10/bin" >> site-setup.csh echo "prepend PATH \$RISCV/gcc-10/bin" >> site-setup.csh
fi fi