From ffaf863c9cd692c608a10a7c6fef61e2106bc2f7 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 7 Feb 2019 13:45:42 -0800 Subject: Revert "Make NPNR an order only dep" This reverts commit 7bc3b6c7589354e490321e8281bfe952fdd6fb55. --- ice40/regressions/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ice40/regressions/Makefile b/ice40/regressions/Makefile index cc76ea7..b1f81b6 100644 --- a/ice40/regressions/Makefile +++ b/ice40/regressions/Makefile @@ -9,8 +9,8 @@ SH_OUTPUT := $(patsubst %.sh,%.log,$(SH)) all: $(JSON_OUTPUT) $(SH_OUTPUT) -$(JSON_OUTPUT): %.log: %.json $(wildcard %.pcf) $(wildcard %.npnr) | $(NPNR) +$(JSON_OUTPUT): %.log: %.json $(wildcard %.pcf) $(wildcard %.npnr) $(NPNR) $(NPNR) --json $(word 1,$^) $(if $(wildcard $*.pcf),--pcf $*.pcf,) $(if $(wildcard $*.npnr),$(shell cat $*.npnr),) > $@ 2>&1 -$(SH_OUTPUT): %.log: %.sh | $(NPNR) +$(SH_OUTPUT): %.log: %.sh $(NPNR) cd $(dir $@) && NPNR=$(NPNR) bash $(notdir $(word 1,$^)) > /dev/null 2>&1 -- cgit v1.2.3