Skip to content

Commit

Permalink
ci & Makefile: fix Verilator installation and PATH handling
Browse files Browse the repository at this point in the history
- Separated autoconf, ./configure, and make steps in install-verilator.sh.
- Adjusted VERILATOR_ROOT and PATH in Makefile for correct executable usage.
- Fixed file copying in install-verilator.sh to update installation and cache directories.
  • Loading branch information
bi262934 committed Jan 28, 2025
1 parent 02fdc7a commit 7f04a98
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ $(PRJ_NAX).v:
.PHONY: src/test/cpp/naxriscv/obj_dir/VNaxRiscv
src/test/cpp/naxriscv/obj_dir/VNaxRiscv:$(PRJ_NAX).v
make -C $(CORE_DIR)/src/test/cpp/naxriscv compile
VERILATOR_ROOT=$(VERILATOR_ROOT_NAX)
VERILATOR_ROOT=$(VERILATOR_ROOT_NAX)/bin
SPIKE=$(SPIKE_DIR)
PATH=$(VERILATOR_ROOT_NAX)/bin:$(PATH)
PATH=$(VERILATOR_ROOT_NAX):$(PATH)

verilate-$(PRJ_NAX): src/test/cpp/naxriscv/obj_dir/VNaxRiscv

Expand Down
5 changes: 4 additions & 1 deletion ci/install-verilator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ if [ ! -e "$2/verilator-$1/bin/verilator" ]; then
git checkout $1
mkdir -p $2/verilator-$1
# copy scripts
autoconf && ./configure --prefix="$2/verilator-$1" && make -j `nproc`
autoconf
./configure --prefix="$2/verilator-$1"
make -j$(nproc)
cp -r * $2/verilator-$1/
rm -rf ~/tools/verilator
cp -r * ~/tools/verilator
cd ..
else
echo "Using Verilator from cached directory."
# Vérification que ~/tools/verilator est à jour
Expand Down

0 comments on commit 7f04a98

Please sign in to comment.