diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-15 16:26:11 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-15 21:07:37 +0000 |
| commit | 183f5e38ee775f2e8c57bd061db80baf7da3b4c7 (patch) | |
| tree | e4d04a40c504715d73525ce7d90431dd5fe78563 /Makefile.in | |
| parent | 33e26da304922d5e6f46350492324dfce0afb3ef (diff) | |
don't export the various language lists and consolidate them
this further frees the environment for Windows builders, to reduce the
risk of running into "environment is too large for exec" errors when
attempting to use xargs in a recipe.
Change-Id: I7e0b97163372018edb12329f24bb1dfafeefc526
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144235
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a326701b92eb..74acf9542e94 100644 --- a/Makefile.in +++ b/Makefile.in @@ -320,7 +320,7 @@ endif define gb_Top_DoInstall echo "$(1) in $(INSTALLDIR) ..." && \ -$(SRCDIR)/solenv/bin/ooinstall $(2) "$(INSTALLDIR)" +WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall $(2) "$(INSTALLDIR)" endef @@ -358,7 +358,7 @@ test-install: build ifeq ($(OS_FOR_BUILD),WNT) cd $(SRCDIR)/instsetoo_native && $(MAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS) else - @$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR) + @WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR) ifeq ($(OS),MACOSX) # # Create Resources/*.lproj directories for languages supported by macOS @@ -449,10 +449,10 @@ endif touch $@ distro-pack-install: install - $(SRCDIR)/bin/distro-install-clean-up + WITH_LANG_LIST="$(WITH_LANG_LIST)" WITH_POOR_HELP_LOCALIZATIONS="$(WITH_POOR_HELP_LOCALIZATIONS)" $(SRCDIR)/bin/distro-install-clean-up $(SRCDIR)/bin/distro-install-desktop-integration $(SRCDIR)/bin/distro-install-sdk - $(SRCDIR)/bin/distro-install-file-lists + WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/bin/distro-install-file-lists install-package-%: $(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ |