diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-07 13:45:42 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-07 13:45:42 -0800 |
| commit | ffaf863c9cd692c608a10a7c6fef61e2106bc2f7 (patch) | |
| tree | eb1c7af0e552b5e44e18587a8293687a5dc5e1da | |
| parent | 7bc3b6c7589354e490321e8281bfe952fdd6fb55 (diff) | |
| download | nextpnr-tests-ffaf863c9cd692c608a10a7c6fef61e2106bc2f7.tar.gz nextpnr-tests-ffaf863c9cd692c608a10a7c6fef61e2106bc2f7.tar.bz2 nextpnr-tests-ffaf863c9cd692c608a10a7c6fef61e2106bc2f7.zip | |
Revert "Make NPNR an order only dep"
This reverts commit 7bc3b6c7589354e490321e8281bfe952fdd6fb55.
| -rw-r--r-- | ice40/regressions/Makefile | 4 |
1 files 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 |