Skip to content

Commit 0f70f74

Browse files
authored
Merge pull request #1234 from Pinata-Consulting/makefile-use-new-enough-yosys
makefile: yosys 0.13 or newer required
2 parents c1b910d + e17402c commit 0f70f74

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

flow/Makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,16 @@ endif
267267

268268
# The following determine the executable location for each tool used by this flow.
269269
# Priority is given to
270-
# 1 user include path to the executable prior to running make
271-
# 2 user explicit set with variable in Makefile or command line
272-
export OPENROAD_EXE ?= $(shell command -v openroad)
273-
ifeq ($(OPENROAD_EXE),)
274-
export OPENROAD_EXE = $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
275-
endif
270+
# 1 user explicit set with variable in Makefile or command line, for instance setting OPENROAD_EXE
271+
# 2 ORFS compiled tools: openroad, yosys
272+
export OPENROAD_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
273+
276274
OPENROAD_ARGS = -no_init $(OR_ARGS)
277275
OPENROAD_CMD = $(OPENROAD_EXE) -exit $(OPENROAD_ARGS)
278276
OPENROAD_NO_EXIT_CMD = $(OPENROAD_EXE) $(OPENROAD_ARGS)
279277
OPENROAD_GUI_CMD = $(OPENROAD_EXE) -gui $(OR_ARGS)
280278

281-
YOSYS_CMD ?= $(shell command -v yosys)
282-
ifeq ($(YOSYS_CMD),)
283-
YOSYS_CMD = $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
284-
endif
279+
YOSYS_CMD ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
285280

286281
KLAYOUT_CMD ?= $(shell command -v klayout)
287282

0 commit comments

Comments
 (0)