diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh index 836a5625f..de8c0ebc1 100755 --- a/bin/wally-package-install.sh +++ b/bin/wally-package-install.sh @@ -107,7 +107,7 @@ case "$FAMILY" in SPIKE_PACKAGES+=(dtc libboost_regex1_75_0-devel libboost_system1_75_0-devel) VERILATOR_PACKAGES+=(gperftools perl-doc) BUILDROOT_PACKAGES+=(ncurses-utils ncurses-devel ncurses5-devel gcc-fortran) # gcc-fortran is only needed for compiling spec benchmarks on buildroot linux - OTHER_PACKAGES+=(gcc14 gcc14-c++ cpp14) # Newer version of gcc needed for many tools. Default is gcc7 + OTHER_PACKAGES+=(gcc13 gcc13-c++ cpp13) # Newer version of gcc needed for many tools. Default is gcc7 ;; esac diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 77895261c..35578d008 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -192,11 +192,11 @@ fi if [ "$FAMILY" == rhel ]; then source /opt/rh/gcc-toolset-13/enable elif [ "$FAMILY" == suse ]; then - mkdir -p "$RISCV"/gcc-14/bin + mkdir -p "$RISCV"/gcc-13/bin for f in gcc cpp g++ gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool lto-dump; do - ln -vsf /usr/bin/$f-14 "$RISCV"/gcc-14/bin/$f + ln -vsf /usr/bin/$f-13 "$RISCV"/gcc-13/bin/$f done - export PATH="$RISCV"/gcc-14/bin:$PATH + export PATH="$RISCV"/gcc-13/bin:$PATH elif (( UBUNTU_VERSION == 20 )); then 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 diff --git a/site-setup.sh b/site-setup.sh index 8df82503a..4699ff348 100755 --- a/site-setup.sh +++ b/site-setup.sh @@ -77,8 +77,8 @@ fi # Use newer gcc version for older distros if [ -e /opt/rh/gcc-toolset-13/enable ]; then source /opt/rh/gcc-toolset-13/enable # Red Hat Family -elif [ -e $RISCV/gcc-14 ]; then - export PATH=$RISCV/gcc-14/bin:$PATH # SUSE Family +elif [ -e $RISCV/gcc-13 ]; then + export PATH=$RISCV/gcc-13/bin:$PATH # SUSE Family elif [ -e $RISCV/gcc-10 ]; then export PATH=$RISCV/gcc-10/bin:$PATH # Ubuntu 20.04 LTS fi