diff options
Diffstat (limited to 'solenv/gbuild/source_and_rerun.mk')
| -rw-r--r-- | solenv/gbuild/source_and_rerun.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index 4d8101a0c3b5..dc6d9ca40818 100644 --- a/solenv/gbuild/source_and_rerun.mk +++ b/solenv/gbuild/source_and_rerun.mk @@ -14,7 +14,7 @@ gb_SourceEnvAndRecurse_buildpl=true else SRCDIR:=$(realpath $(gb_MAKEFILEDIR)) -gb_SourceEnvAndRecurse_reconfigure=$(call gb_SourceEnvAndRecurse_recurse,$(SRCDIR)/Env.Host.sh,reconfigure) +gb_SourceEnvAndRecurse_reconfigure=$(call gb_SourceEnvAndRecurse_recurse,$(SRCDIR)/config_host.mk,reconfigure) gb_SourceEnvAndRecurse_buildpl=$(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),buildpl) endif @@ -22,14 +22,13 @@ endif source-env-and-recurse: @$(gb_SourceEnvAndRecurse_reconfigure) && \ if test -f $(SRCDIR)/config_host.mk ; then . $(SRCDIR)/config_host.mk; fi && \ - if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \ if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \ $(gb_SourceEnvAndRecurse_buildpl) && \ $(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),gbuild) \ ifneq ($(strip $(MAKECMDGOALS)),) -ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh) +ifneq ($(MAKECMDGOALS),$(SRCDIR)/config_host.mk) $(eval $(MAKECMDGOALS) : source-env-and-recurse) endif endif |