Clear MAKEFLAGS when running dvsim.py

dvsim.py runs make as a subprocess, which gets rather confused if
MAKEFLAGS appears in its environment. The proper fix is to clear them
from the environment in the dvsim command: we'll do that on the
OpenTitan side[1] and can revert this patch once that change is vendored
in.

[1] https://github.com/lowRISC/opentitan/pull/4325
This commit is contained in:
Rupert Swarbrick 2020-11-27 11:44:47 +00:00 committed by Rupert Swarbrick
parent 3d8041597b
commit 31a18ad10c

View file

@ -44,6 +44,11 @@ dvsim-mk-args := \
$(waves-arg) $(coverage-arg) $(verbosity-arg) \
$(reseed-arg) $(seed-arg) $(tests-arg)
run-cmd := $(dvsim-py) ibex_icache_sim_cfg.hjson $(dvsim-std-args) $(dvsim-mk-args)
# Clear MAKEFLAGS when running dvsim.py: it contains an internal call
# to Make and things get confused if they are set.
.PHONY: run
run:
$(dvsim-py) ibex_icache_sim_cfg.hjson $(dvsim-std-args) $(dvsim-mk-args)
@echo $(run-cmd)
@env MAKEFLAGS= $(run-cmd)