diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
3 files changed, 10 insertions, 15 deletions
@@ -26,23 +26,18 @@ # #************************************************************************* -gb_SOURCEANDRERUN:= -SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST))))) -ifeq ($(strip $(SOLARENV)),) -ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh) -gb_SOURCEANDRERUN:=T -gb_MINISOLARENV:= -else -SOLARENV:=$(SRCDIR)/solenv -gb_MINISOLARENV:=T +SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))) + +ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),) +include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk endif + +ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure) +SOLARENV:=$(SRCDIR)/solenv endif -ifneq ($(gb_SOURCEANDRERUN),) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk -else +ifneq ($(filter reconfigure gbuild buildpl,$(gb_SourceEnvAndRecurse_STAGE)),) include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index b8a002fff95a..ce4a5cbfc26b 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded # fixme: can we prevent these exports in the first place? $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in - $(if $(gb_MINISOLARENV),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) + $(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) $(WORKDIR)/bootstrap: @cd $(SRCDIR) && ./bootstrap diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9f0b32b540c9..e85ed83543c5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -151,7 +151,7 @@ $(eval $(call gb_Helper_collect_libtargets)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions -ifeq ($(strip $(gb_MINISOLARENV)),) +ifneq ($(filter gbuild buidpl,$(gb_SourceEnvAndRecurse_STAGE)),) include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk endif |