From 623bafacd5731b84e49d87a400499db38ab2bf66 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Wed, 10 Jun 2020 14:46:53 -0700
Subject: [PATCH] Warn if RISCV unset (#601)

---
 .circleci/do-rtl-build.sh | 7 ++++++-
 common.mk                 | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
index 54996f54..a7c8ad50 100755
--- a/.circleci/do-rtl-build.sh
+++ b/.circleci/do-rtl-build.sh
@@ -53,15 +53,20 @@ else
 fi
 
 # enter the verilator directory and build the specific config on remote server
-run "make -C $REMOTE_SIM_DIR clean"
 run "export RISCV=\"$TOOLS_DIR\"; \
      export LD_LIBRARY_PATH=\"$LD_LIB_DIR\"; \
      export PATH=\"$REMOTE_VERILATOR_DIR/bin:\$PATH\"; \
      export VERILATOR_ROOT=\"$REMOTE_VERILATOR_DIR\"; \
      export COURSIER_CACHE=\"$REMOTE_WORK_DIR/.coursier-cache\"; \
+     make -C $REMOTE_SIM_DIR clean; \
      make -j$REMOTE_MAKE_NPROC -C $REMOTE_SIM_DIR JAVA_ARGS=\"$REMOTE_JAVA_ARGS\" ${mapping[$1]}"
 run "rm -rf $REMOTE_CHIPYARD_DIR/project"
 
+# copy back the final build
+
+
+run "rm -rf $REMOTE_CHIPYARD_DIR/project"
+
 # copy back the final build
 mkdir -p $LOCAL_CHIPYARD_DIR
 copy $SERVER:$REMOTE_CHIPYARD_DIR/ $LOCAL_CHIPYARD_DIR
diff --git a/common.mk b/common.mk
index f07342de..4b5b00f2 100644
--- a/common.mk
+++ b/common.mk
@@ -3,6 +3,14 @@
 #########################################################################################
 SHELL=/bin/bash
 
+
+ifndef RISCV
+$(error RISCV is unset. You must set RISCV yourself, or through the Chipyard auto-generated env file)
+else
+$(info Running with RISCV=$(RISCV))
+endif
+
+
 #########################################################################################
 # extra make variables/rules from subprojects
 #