sencha: build mpact_cheriot simulator from source

Bypass-Presubmit-Reason: no sencha CI tests

Change-Id: I7de758965ec0311937cbc8b773368bf7d22d4309

platforms/sencha/sim.mk

diff --git a/platforms/sencha/sim.mk b/platforms/sencha/sim.mk
index bfabeb5..c8dd05c 100644
--- a/platforms/sencha/sim.mk
+++ b/platforms/sencha/sim.mk
@@ -15,7 +15,7 @@
 EXT_FLASH_DEBUG=$(CHERIOT_OUT_DEBUG)/ext_flash.tar
 EXT_FLASH_RELEASE=$(CHERIOT_OUT_RELEASE)/ext_flash.tar
 
-CHERIOT_SIM_SRC_DIR := $(ROOTDIR)/sim/cheriot
+CHERIOT_SIM_SRC_DIR := $(ROOTDIR)/sim/mpact-cheriot
 CHERIOT_SIM_OUT_DIR := $(OUT)/cheriot/sim
 
 TMP_DEBUG=$(CHERIOT_OUT_DEBUG)/tmp
@@ -128,27 +128,22 @@
 #
 # Build mpact-sim-based CHERIoT ISS with bazel, and copy it to out/
 # Use /tmp as the bazel tmpfs to unblock CI
-cheriot_sim_notyet: | $(CHERIOT_SIM_OUT_DIR)
+cheriot_sim: | $(CHERIOT_SIM_OUT_DIR)
 	cd "$(CHERIOT_SIM_SRC_DIR)" && \
-		bazel build --sandbox_tmpfs_path=/tmp //sim:cheriot_sim \
-		  //sim/renode:renode_cheriot
+		bazel build --sandbox_tmpfs_path=/tmp \
+			//cheriot:mpact_cheriot \
+			//cheriot:renode_mpact_cheriot
 	cd "$(CHERIOT_SIM_SRC_DIR)/bazel-bin" && \
-		cp -f sim/cheriot_sim "$(CHERIOT_SIM_OUT_DIR)" && \
-		cp -f sim/renode/librenode_mpact_cheriot.so "$(CHERIOT_SIM_OUT_DIR)"
+		cp -f cheriot/mpact_cheriot "$(CHERIOT_SIM_OUT_DIR)" && \
+		cp -f cheriot/librenode_mpact_cheriot.so "$(CHERIOT_SIM_OUT_DIR)"
 
 ## Clean CHERIoT ISS
 #
 # Clean the CHERIoT ISS
-cheriot_sim_clean_notyet:
+cheriot_sim_clean:
 	cd "$(CHERIOT_SIM_SRC_DIR)" && \
 		bazel clean --expunge
 	rm -rf $(CHERIOT_SIM_OUT_DIR)
 
-# TODO(sleffler): temporary hack until the simulator source is integrated
-cheriot_sim: | $(CHERIOT_SIM_OUT_DIR)
-	cp -f ${CACHE}/cheriot-tools/librenode_mpact_cheriot.so "$(CHERIOT_SIM_OUT_DIR)"
-cheriot_sim_clean:
-	rm -rf $(CHERIOT_SIM_OUT_DIR)
-
 .PHONY:: sim_configs clean_sim_configs simulate simulate-debug debug-simulation
 .PHONY:: cheriot_sim cheriot_sim_clean