From 00465b15c3b0ea5cc0e1772e3cc7dadae02a8e2c Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Sat, 30 Jan 2016 20:56:00 -0800 Subject: [PATCH] Allow the regression Makefile to clean all targets --- fsim/Makefile | 2 ++ regression/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fsim/Makefile b/fsim/Makefile index fe89bfa3..8e765a34 100644 --- a/fsim/Makefile +++ b/fsim/Makefile @@ -21,7 +21,9 @@ TB ?= rocketTestHarness include $(base_dir)/Makefrag include $(sim_dir)/Makefrag +ifneq ($(MAKECMDGOALS),clean) -include $(generated_dir)/$(MODEL).$(CONFIG).d +endif include $(base_dir)/vsim/Makefrag-verilog all: $(simv) diff --git a/regression/Makefile b/regression/Makefile index 2a25f022..30d0d8b6 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -29,9 +29,9 @@ TORTURE_SAVE_DIR ?= torture-failures .PHONY: clean clean: rm -rf stamps $(abspath $(RISCV)) - $(MAKE) -C $(abspath $(TOP)/vsim) clean - $(MAKE) -C $(abspath $(TOP)/fsim) clean - $(MAKE) -C $(abspath $(TOP)/emulator) clean + $(MAKE) RISCV=$(RISCV) -C $(abspath $(TOP)/vsim) clean + $(MAKE) RISCV=$(RISCV) -C $(abspath $(TOP)/fsim) clean + $(MAKE) RISCV=$(RISCV) -C $(abspath $(TOP)/emulator) clean # These are the named regression targets. While it's expected you run them in # this order, since there's dependencies for everything it doesn't actually