mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill gb_MINISOLARENV in favor of stages

Browse Source
This commit is contained in:
Bjoern Michaelsen 2011-12-02 14:47:00 +01:00
parent 09bd4fd7c4
commit a7c567ad15
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -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
endif
SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),)
include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk
endif
ifneq ($(gb_SOURCEANDRERUN),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
else
ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure)
SOLARENV:=$(SRCDIR)/solenv
endif
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:

2
solenv/gbuild/extensions/post_AuxTargets.mk
View File

@ -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

2
solenv/gbuild/gbuild.mk
View File

@ -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