Update LD_LIBRARY_PATH to fix qemu on Ubuntu 20.04

This commit is contained in:
Jordan Carlin 2024-07-27 11:35:59 -07:00
parent a32cdf273f
commit 178d401c5c
3 changed files with 6 additions and 5 deletions

View file

@ -400,9 +400,9 @@ fi
section_header "Installing Buildroot and Creating Linux testvectors" section_header "Installing Buildroot and Creating Linux testvectors"
STATUS="Buildroot" STATUS="Buildroot"
if [ -z "$LD_LIBRARY_PATH" ]; then 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 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 fi
cd "$dir"/../linux cd "$dir"/../linux
if [ ! -e "$RISCV"/buildroot ]; then if [ ! -e "$RISCV"/buildroot ]; then

View file

@ -26,6 +26,7 @@ endif
# RISC-V Tools # RISC-V Tools
extend LD_LIBRARY_PATH $RISCV/lib extend LD_LIBRARY_PATH $RISCV/lib
extend LD_LIBRARY_PATH $RISCV/lib64 extend LD_LIBRARY_PATH $RISCV/lib64
extend LD_LIBRARY_PATH $RISCV/lib/x86_64-linux-gnu/
extend PATH $RISCV/bin extend PATH $RISCV/bin
# Activate riscv-python Virtual Environment # Activate riscv-python Virtual Environment

View file

@ -27,7 +27,7 @@ else
fi fi
# RISC-V Tools # 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 export PATH=$PATH:$RISCV/bin
# Activate riscv-python Virtual Environment # Activate riscv-python Virtual Environment
@ -54,7 +54,7 @@ if [ -e "$IDV" ]; then
export IMPERAS_HOME=$IDV/Imperas export IMPERAS_HOME=$IDV/Imperas
export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
export ROOTDIR=~/ export ROOTDIR=~/
source ${IMPERAS_HOME}/bin/setup.sh source "${IMPERAS_HOME}"/bin/setup.sh
setupImperas ${IMPERAS_HOME} setupImperas "${IMPERAS_HOME}"
export PATH=$IDV/scripts/cvw:$PATH export PATH=$IDV/scripts/cvw:$PATH
fi fi