From 760291d6cc050c686be1d3d22ef66e471c2adce2 Mon Sep 17 00:00:00 2001 From: "James E. Stine" Date: Tue, 9 Apr 2024 09:00:45 -0500 Subject: [PATCH 1/3] On some Ubuntu boxes, the path for Wally interferes with other tools. Prepending Wally path to make sure there are no conflicts. --- site-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-setup.sh b/site-setup.sh index 1ffca5fd4..809fcb602 100755 --- a/site-setup.sh +++ b/site-setup.sh @@ -21,11 +21,11 @@ export PATH=$QUESTA_HOME/bin:$DC_HOME/bin:$VCS_HOME/bin:$PATH # GCC export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RISCV/riscv-gnu-toolchain/lib:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/lib -export PATH=$PATH:$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin # GCC tools +export PATH=$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin:$PATH # GCC tools # Spike export LD_LIBRARY_PATH=$RISCV/lib:$LD_LIBRARY_PATH -export PATH=$PATH:$RISCV/bin +export PATH=$RISCV/bin:$PATH # Verilator export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator From fd4ce8eca73dba4fdb242738af3e51483a0cf8e1 Mon Sep 17 00:00:00 2001 From: "James E. Stine" Date: Tue, 9 Apr 2024 10:37:32 -0500 Subject: [PATCH 2/3] Remove path for old GCC tools as it causes some issues. Experimentation by removing caused no problems as just use bin is needed --- site-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/site-setup.sh b/site-setup.sh index 809fcb602..72a00b79f 100755 --- a/site-setup.sh +++ b/site-setup.sh @@ -21,7 +21,6 @@ export PATH=$QUESTA_HOME/bin:$DC_HOME/bin:$VCS_HOME/bin:$PATH # GCC export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RISCV/riscv-gnu-toolchain/lib:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/lib -export PATH=$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin:$PATH # GCC tools # Spike export LD_LIBRARY_PATH=$RISCV/lib:$LD_LIBRARY_PATH From c7f177100cc86ab6801ba31ec79db048bc515d0e Mon Sep 17 00:00:00 2001 From: "James E. Stine" Date: Tue, 16 Apr 2024 09:51:24 -0500 Subject: [PATCH 3/3] update path for #721 --- site-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-setup.sh b/site-setup.sh index 72a00b79f..3c15f5e38 100755 --- a/site-setup.sh +++ b/site-setup.sh @@ -24,7 +24,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RISCV/riscv-gnu-toolchain/lib:$RISCV/ri # Spike export LD_LIBRARY_PATH=$RISCV/lib:$LD_LIBRARY_PATH -export PATH=$RISCV/bin:$PATH +export PATH=$PATH:$RISCV/bin # Verilator export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator