diff options
| -rw-r--r-- | GNUmakefile.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/BuildDirs.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/GNUmakefile.mk b/GNUmakefile.mk index e25b46e61189..1810a2ec8b66 100644 --- a/GNUmakefile.mk +++ b/GNUmakefile.mk @@ -33,6 +33,6 @@ endif GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/RepositoryModule_*.mk)))) +$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 6cb575af98ac..ad2fa51065e9 100644 --- a/solenv/gbuild/BuildDirs.mk +++ b/solenv/gbuild/BuildDirs.mk @@ -40,8 +40,7 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)), include $(gb_LOCALBUILDDIR)/SetupLocal.mk endif -ifeq ($(strip $(gb_REPOS)),) -gb_REPOS := $(SOLARSRC) +SRCDIR := $(SOLARSRC) endif # HACK @@ -50,15 +49,9 @@ ifeq ($(OS_FOR_BUILD),WNT) override WORKDIR := $(shell cygpath -u $(WORKDIR)) override OUTDIR := $(shell cygpath -u $(OUTDIR)) override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD)) -override gb_REPOS := $(shell cygpath -u $(gb_REPOS)) +override SRCDIR := $(shell cygpath -u $(SRCDIR)) endif -REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS)))) - -ifeq ($(filter setuplocal removelocal,$(MAKECMDGOALS)),) -ifneq ($(filter-out $(foreach repo,$(gb_REPOS),$(realpath $(repo))/%),$(realpath $(firstword $(MAKEFILE_LIST)))),) -$(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKEFILE_LIST))) is not in the repositories $(foreach repo,$(gb_REPOS),$(realpath $(repo))).,ALL)) -endif -endif +REPODIR := $(patsubst %/,%,$(dir $(SRCDIR))) # vim: set noet sw=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 22b92166257f..fb3ab0930385 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -152,7 +152,7 @@ include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk $(eval $(call gb_Helper_init_registries)) -$(eval $(call gb_Helper_add_repositories,$(gb_REPOS))) +$(eval $(call gb_Helper_add_repositories,$(SOLARSRC))) $(eval $(call gb_Helper_collect_libtargets)) gb_Library_DLLPOSTFIX := lo @@ -194,7 +194,7 @@ endif include $(GBUILDDIR)/Tempfile.mk -include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk) +include $(SOLARSRC)/RepositoryFixes.mk $(eval $(call gb_Helper_collect_knownlibs)) |