Skip to content

Commit ef48d5f

Browse files
authored
Merge pull request #2183 from Pinata-Consulting/makefile-fewer-klayout-invocations
makefile: reduce number of shell invocations
2 parents dd727d4 + 807e96b commit ef48d5f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

flow/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,9 @@ KLAYOUT_BIN_FROM_DIR = $(KLAYOUT_DIR)/klayout
301301
ifeq ($(wildcard $(KLAYOUT_BIN_FROM_DIR)), $(KLAYOUT_BIN_FROM_DIR))
302302
KLAYOUT_CMD ?= sh -c 'LD_LIBRARY_PATH=$(dir $(KLAYOUT_BIN_FROM_DIR)) $$0 "$$@"' $(KLAYOUT_BIN_FROM_DIR)
303303
else
304-
KLAYOUT_CMD ?= $(shell command -v klayout)
304+
ifeq ($(KLAYOUT_CMD),)
305+
KLAYOUT_CMD := $(shell command -v klayout)
306+
endif
305307
endif
306308
KLAYOUT_FOUND = $(if $(KLAYOUT_CMD),,$(error KLayout not found in PATH))
307309

@@ -393,7 +395,7 @@ do-klayout_tech:
393395
cp $(TECH_LEF) $(OBJECTS_DIR)/klayout_tech.lef
394396

395397
KLAYOUT_ENV_VAR_IN_PATH_VERSION = 0.28.11
396-
KLAYOUT_VERSION = $(shell $(KLAYOUT_CMD) -v 2>/dev/null | grep 'KLayout' | cut -d ' ' -f2)
398+
KLAYOUT_VERSION := $(shell $(KLAYOUT_CMD) -v 2>/dev/null | grep 'KLayout' | cut -d ' ' -f2)
397399

398400
KLAYOUT_ENV_VAR_IN_PATH = $(shell \
399401
if [ -z "$(KLAYOUT_VERSION)" ]; then \

0 commit comments

Comments
 (0)