Update LD_LIBRARY_PATH to fix qemu on Ubuntu 20.04

jordancarlin · Jul 27, 2024 · 98076b4 · 98076b4
1 parent 0d0b81c
commit 98076b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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