Commit 8826393
committed
make: preserve tool *_EXE env vars across UNSET_AND_MAKE
Commit df79ba1 ("make: immediately expand deferred vars") changed
the tool-path setup from
export OPENROAD_EXE ?= $(abspath ...)
to
OPENROAD_EXE ?= $(abspath ...)
export OPENROAD_EXE := $(OPENROAD_EXE)
The := reassign gives the variable origin "file" even when the value
was supplied through the environment. UNSET_VARIABLES_NAMES collects
every file-origin variable and $(UNSET_AND_MAKE) unsets them in the
bash wrapper before invoking the submake. That strips a caller-
supplied OPENROAD_EXE / OPENSTA_EXE / YOSYS_EXE from the submake's
environment, and variables.mk re-derives them via the
$(FLOW_HOME)/../tools/install/... fallback — a path that does not
exist in hermetic builds (e.g. bazel-orfs).
Extend the unset exclusion list to cover OPENROAD%, OPENSTA%, YOSYS%,
mirroring the KLAYOUT% entry already there for the same reason.
This restores the pre-df79ba1d9 behavior for callers that pass tool
paths through the environment, without reverting the immediate-
expansion fix.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>1 parent 43ca564 commit 8826393
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
188 | 188 | | |
189 | 189 | | |
190 | 190 | | |
191 | | - | |
| 191 | + | |
192 | 192 | | |
193 | 193 | | |
194 | 194 | | |
| |||
0 commit comments