Skip to content

Commit 361e222

Browse files
committed
Added missing time package, fixed exec sourcing for Nix in flow/Makefile.
Signed-off-by: Ryan Slawson <[email protected]>
1 parent dbc9030 commit 361e222

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
buildInputs = [
2525
openroad.packages.${system}.default
2626
yosys.packages.${system}.default
27+
pkgs.time
2728
pkgs.klayout
2829
pkgs.verilator
2930
pkgs.python3

flow/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ endif
233233
# 1 user explicit set with variable in Makefile or command line, for instance setting OPENROAD_EXE
234234
# 2 ORFS compiled tools: openroad, yosys
235235
ifneq (${IN_NIX_SHELL}, "")
236-
export OPENROAD_EXE := $(shell which openroad)
236+
export OPENROAD_EXE := $(shell command -v openroad)
237237
else
238238
export OPENROAD_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
239239
endif
240240
ifneq (${IN_NIX_SHELL}, "")
241-
export OPENSTA_EXE := $(shell which opensta)
241+
export OPENSTA_EXE := $(shell command -v opensta)
242242
else
243243
export OPENSTA_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/opensta)
244244
endif
@@ -249,7 +249,7 @@ OPENROAD_NO_EXIT_CMD = $(OPENROAD_EXE) $(OPENROAD_ARGS)
249249
OPENROAD_GUI_CMD = $(OPENROAD_EXE) -gui $(OR_ARGS)
250250

251251
ifneq (${IN_NIX_SHELL}, "")
252-
YOSYS_EXE := $(shell which yosys)
252+
YOSYS_EXE := $(shell command -v yosys)
253253
else
254254
YOSYS_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
255255
endif

0 commit comments

Comments
 (0)