From 98076b4ad641ec00767377f4ef3dc86847ef75d3 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 27 Jul 2024 11:35:59 -0700
Subject: [PATCH] Update LD_LIBRARY_PATH to fix qemu on Ubuntu 20.04

---
 bin/wally-tool-chain-install.sh | 4 ++--
 site-setup.csh                  | 1 +
 site-setup.sh                   | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index b1019c564..8258861a6 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -401,9 +401,9 @@ fi
 section_header "Installing Buildroot and Creating Linux testvectors"
 STATUS="Buildroot"
 if [ -z "$LD_LIBRARY_PATH" ]; then
-    export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$RISCV/riscv64-unknown-elf/lib
+    export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$RISCV/riscv64-unknown-elf/lib:$RISCV/lib/x86_64-linux-gnu/
 else
-    export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$LD_LIBRARY_PATH:$RISCV/riscv64-unknown-elf/lib
+    export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$LD_LIBRARY_PATH:$RISCV/riscv64-unknown-elf/lib:$RISCV/lib/x86_64-linux-gnu/
 fi
 cd "$dir"/../linux
 if [ ! -e "$RISCV"/buildroot ]; then
diff --git a/site-setup.csh b/site-setup.csh
index bd747dfc9..c8435ddf5 100644
--- a/site-setup.csh
+++ b/site-setup.csh
@@ -26,6 +26,7 @@ endif
 # RISC-V Tools
 extend LD_LIBRARY_PATH $RISCV/lib
 extend LD_LIBRARY_PATH $RISCV/lib64
+extend LD_LIBRARY_PATH $RISCV/lib/x86_64-linux-gnu/
 extend PATH $RISCV/bin
 
 # Activate riscv-python Virtual Environment
diff --git a/site-setup.sh b/site-setup.sh
index 109aedb03..f6a499aec 100755
--- a/site-setup.sh
+++ b/site-setup.sh
@@ -27,7 +27,7 @@ else
 fi
 
 # RISC-V Tools
-export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$RISCV/lib:$RISCV/lib64:$LD_LIBRARY_PATH:$RISCV/lib/x86_64-linux-gnu/
 export PATH=$PATH:$RISCV/bin
 
 # Activate riscv-python Virtual Environment
@@ -54,7 +54,7 @@ if [ -e "$IDV" ]; then
     export IMPERAS_HOME=$IDV/Imperas
     export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
     export ROOTDIR=~/
-    source ${IMPERAS_HOME}/bin/setup.sh
-    setupImperas ${IMPERAS_HOME}
+    source "${IMPERAS_HOME}"/bin/setup.sh
+    setupImperas "${IMPERAS_HOME}"
     export PATH=$IDV/scripts/cvw:$PATH
 fi