diff options
Diffstat (limited to 'RepositoryModule_host.mk')
| -rw-r--r-- | RepositoryModule_host.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a3567c486d8f..f6a9c6ec5c0f 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -11,6 +11,16 @@ $(eval $(call gb_Module_Module,libreoffice)) +# This makefile needs to be read first because some variables like T_LIBS +# for libmerged are cleared there and then later we append stuff to it +# through e.g. gb_Library_use_external for various libraries in libmerged. +ifneq ($(MERGELIBS),) +$(eval $(call gb_Module_add_targets,libreoffice,\ + Library_merged \ + $(if $(URELIBS),Library_urelibs) \ +)) +endif + $(eval $(call gb_Module_add_moduledirs,libreoffice,\ accessibility \ android \ @@ -155,13 +165,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ xmlsecurity \ )) -ifneq ($(MERGELIBS),) -$(eval $(call gb_Module_add_targets,libreoffice,\ - Library_merged \ - $(if $(URELIBS),Library_urelibs) \ -)) -endif - # Especially when building everything with symbols, the linking of the largest # libraries takes enormous amounts of RAM. To prevent annoying OOM situations # etc., try to prevent linking these in parallel by adding artificial build |