Skip to content

Commit 048202f

Browse files
authored
Merge pull request #3256 from Pinata-Consulting/versions-txt-fix
versions.txt: non-zero exit code when commands don't exist
2 parents 3105121 + f20471c commit 048202f

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

flow/Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,9 @@ $(foreach block,$(BLOCKS),$(eval $(WORK_HOME)/results/$(PLATFORM)/$(DESIGN_NICKN
184184
.PHONY: versions.txt
185185
versions.txt:
186186
mkdir -p $(OBJECTS_DIR)
187-
@if [ -z "$(YOSYS_EXE)" ]; then \
188-
echo >> $(OBJECTS_DIR)/$@ "yosys not installed"; \
189-
else \
190-
$(YOSYS_EXE) -V > $(OBJECTS_DIR)/$@; \
191-
fi
192-
@echo openroad `$(OPENROAD_EXE) -version` >> $(OBJECTS_DIR)/$@
193-
@if [ -z "$(KLAYOUT_CMD)" ]; then \
194-
echo >> $(OBJECTS_DIR)/$@ "klayout not installed"; \
195-
else \
196-
$(KLAYOUT_CMD) -zz -v >> $(OBJECTS_DIR)/$@; \
197-
fi
187+
@echo "yosys $(shell $(YOSYS_EXE) -V 2>&1)" > $(OBJECTS_DIR)/$@
188+
@echo "openroad $(shell $(OPENROAD_EXE) -version 2>&1)" >> $(OBJECTS_DIR)/$@
189+
@echo "klayout $(shell $(KLAYOUT_CMD) -zz -v 2>&1)" >> $(OBJECTS_DIR)/$@
198190

199191
# Pre-process libraries
200192
# ==============================================================================

0 commit comments

Comments
 (0)