From 0782b2fee078fc9c974ba112216aa4c72b872091 Mon Sep 17 00:00:00 2001
From: Francesco Conti <f.conti@unibo.it>
Date: Tue, 16 Apr 2024 10:29:02 +0000
Subject: [PATCH] Align to QoL changes introduced previously in
 carfield-cluster

---
 rules/pulpos/targets/astral-cluster.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rules/pulpos/targets/astral-cluster.mk b/rules/pulpos/targets/astral-cluster.mk
index 5eec999..b88d627 100644
--- a/rules/pulpos/targets/astral-cluster.mk
+++ b/rules/pulpos/targets/astral-cluster.mk
@@ -1,4 +1,10 @@
+HOSTNAME := $(shell hostname)
+ETH_HOST = $(shell echo $(HOSTNAME) | grep -q "\.ee\.ethz\.ch$$" && echo 1 || echo 0)
+ifeq (ETH_HOST,1)
 QUESTA ?= questa-2022.3
+else
+QUESTA ?= 
+endif
 ifdef USE_IBEX
 PULP_LDFLAGS      +=
 PULP_CFLAGS       +=  -D__ibex__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 -DRV_ISA_RV32
@@ -73,5 +79,5 @@ ifndef gui
 vsim-flags = -c
 endif
 
-run:
-	$(QUESTA) vsim $(vsim-flags) -do "set  VSIM_PATH $(VSIM_PATH); source $(VSIM_PATH)/scripts/start.tcl"
+run: $(TARGETS)
+	cd $(TARGET_BUILD_DIR); $(QUESTA) vsim $(vsim-flags) -do "set  VSIM_PATH $(VSIM_PATH); source $(VSIM_PATH)/scripts/start.tcl"