mirror of
https://github.com/openhwgroup/cvw
synced 2025-02-11 06:05:49 +00:00
Merge ac2b3ca273
into 077c13c8b4
This commit is contained in:
commit
8586738cba
@ -149,6 +149,7 @@ fi
|
|||||||
export PATH=$PATH:$RISCV/bin:/usr/bin
|
export PATH=$PATH:$RISCV/bin:/usr/bin
|
||||||
export PKG_CONFIG_PATH=$RISCV/lib64/pkgconfig:$RISCV/lib/pkgconfig:$RISCV/share/pkgconfig:$RISCV/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH=$RISCV/lib64/pkgconfig:$RISCV/lib/pkgconfig:$RISCV/share/pkgconfig:$RISCV/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
|
||||||
|
|
||||||
|
# wget retry on host error flag not available with older wget on RHEL 8
|
||||||
if (( RHEL_VERSION != 8 )); then
|
if (( RHEL_VERSION != 8 )); then
|
||||||
retry_on_host_error="--retry-on-host-error"
|
retry_on_host_error="--retry-on-host-error"
|
||||||
fi
|
fi
|
||||||
@ -190,6 +191,11 @@ else
|
|||||||
source "${dir}"/wally-package-install.sh --check
|
source "${dir}"/wally-package-install.sh --check
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Older version of git defaults to protocol version incompatible with riscv-gnu-toolchain
|
||||||
|
if (( UBUNTU_VERSION == 20 )); then
|
||||||
|
git config --global protocol.version 2
|
||||||
|
fi
|
||||||
|
|
||||||
# Enable newer version of gcc for older distros (required for QEMU/Verilator)
|
# Enable newer version of gcc for older distros (required for QEMU/Verilator)
|
||||||
if [ "$FAMILY" == rhel ]; then
|
if [ "$FAMILY" == rhel ]; then
|
||||||
source /opt/rh/gcc-toolset-13/enable
|
source /opt/rh/gcc-toolset-13/enable
|
||||||
@ -446,10 +452,9 @@ STATUS="riscv-sail-model"
|
|||||||
if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
|
if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
|
||||||
cd "$RISCV"/sail-riscv
|
cd "$RISCV"/sail-riscv
|
||||||
git reset --hard && git clean -f && git checkout master && git pull
|
git reset --hard && git clean -f && git checkout master && git pull
|
||||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
|
cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="$RISCV" -GNinja 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
|
||||||
cmake --build build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
|
cmake --build build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
|
||||||
cp -f build/c_emulator/riscv_sim_rv64d "$RISCV"/bin/riscv_sim_rv64d
|
cmake --install build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
|
||||||
cp -f build/c_emulator/riscv_sim_rv32d "$RISCV"/bin/riscv_sim_rv32d
|
|
||||||
if [ "$clean" ]; then
|
if [ "$clean" ]; then
|
||||||
cd "$RISCV"
|
cd "$RISCV"
|
||||||
rm -rf sail-riscv
|
rm -rf sail-riscv
|
||||||
|
Loading…
Reference in New Issue
Block a user