From ca66852b631ef6402a096b5ecab7988495b1663c Mon Sep 17 00:00:00 2001
From: Yvan Tortorella <yvan.tortorella@gmail.com>
Date: Fri, 21 Mar 2025 11:11:56 +0100
Subject: [PATCH] Small changes to fix RTL build flow.

---
 target/common/common.mk | 2 +-
 target/common/vsim.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/common/common.mk b/target/common/common.mk
index d77465fe5e..f1bcee2e8b 100644
--- a/target/common/common.mk
+++ b/target/common/common.mk
@@ -30,7 +30,7 @@ MATCH_BGN := 's/+incdir+//g'
 MATCH_DEF := '/+define+/d'
 SED_SRCS  := sed -e ${MATCH_END} -e ${MATCH_BGN} -e ${MATCH_DEF}
 
-COMMON_BENDER_FLAGS += -t rtl
+COMMON_BENDER_FLAGS += -t rtl -t snitch_cluster
 COMMON_SIM_BENDER_FLAGS += -t simulation -t test
 
 # fesvr is being installed here
diff --git a/target/common/vsim.mk b/target/common/vsim.mk
index 2600d2c0ef..a29357dd23 100644
--- a/target/common/vsim.mk
+++ b/target/common/vsim.mk
@@ -53,7 +53,7 @@ $(VSIM_BUILDDIR)/compile.vsim.tcl: $(BENDER_LOCK) | $(VSIM_BUILDDIR)
 $(BIN_DIR)/$(TARGET).vsim: $(VSIM_BUILDDIR)/compile.vsim.tcl $(VSIM_SOURCES) $(TB_SRCS) $(TB_CC_SOURCES) $(RTL_CC_SOURCES) work/lib/libfesvr.a | $(BIN_DIR)
 	$(VSIM) -c -do "source $<; quit" | tee $(VSIM_BUILDDIR)vlog.log
 	@! grep -P "Errors: [1-9]*," $(VSIM_BUILDDIR)vlog.log
-	$(VOPT) $(VOPT_FLAGS) tb_bin -o tb_bin_opt | tee $(VSIM_BUILDDIR)vopt.log
+	$(VOPT) $(VOPT_FLAGS) -work $(VSIM_BUILDDIR) tb_bin -o tb_bin_opt | tee $(VSIM_BUILDDIR)vopt.log
 	@! grep -P "Errors: [1-9]*," $(VSIM_BUILDDIR)vopt.log
 	@echo "#!/bin/bash" > $@
 	@echo 'binary=$$(realpath $$1)' >> $@