summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--nandgame/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ab1504f..48875cc 100644
--- a/Makefile
+++ b/Makefile
@@ -108,8 +108,10 @@ verilator.%: %.v %_tb.v
# need to specify RM for some reason
# verilators makefiles doesn't specify the variable
verilator.%/dump.vvp: verilator.%
- $(MAKE) -j4 -C verilator.$(*) -f V$(*).mk RM=rm
- cd verilator.$(*) && ./V$(*)
+# for whatever reason, some version of vlor started to append _tb.
+ ($(MAKE) -j4 -C verilator.$(*) -f V$(*).mk RM=rm || \
+ $(MAKE) -j4 -C verilator.$(*) -f V$(*)_tb.mk RM=rm)
+ cd verilator.$(*) && (./V$(*) || ./V$(*)_tb)
## inter-file dependencies
-include $(DEPS)
diff --git a/nandgame/Makefile b/nandgame/Makefile
index eb8258e..1c8dae2 100644
--- a/nandgame/Makefile
+++ b/nandgame/Makefile
@@ -109,8 +109,10 @@ verilator.%: %.sv %_tb.sv
# need to specify RM for some reason
# verilators makefiles doesn't specify the variable
verilator.%/dump.vvp: verilator.%
- $(MAKE) -j4 -C verilator.$(*) -f V$(*).mk RM=rm
- cd verilator.$(*) && ./V$(*)
+# for whatever reason, some version of vlor started to append _tb.
+ ($(MAKE) -j4 -C verilator.$(*) -f V$(*).mk RM=rm || \
+ $(MAKE) -j4 -C verilator.$(*) -f V$(*)_tb.mk RM=rm)
+ cd verilator.$(*) && (./V$(*) || ./V$(*)_tb)
## inter-file dependencies
-include $(DEPS)