[Libreoffice-commits] core.git: RepositoryModule_build.mk solenv/gbuild

Tor Lillqvist tml at collabora.com
Wed Sep 17 06:31:48 PDT 2014


 RepositoryModule_build.mk                  |    1 +
 solenv/gbuild/extensions/pre_BuildTools.mk |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit c42d2a5c7a195c6d80160567a098d1387de741e5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 17 16:26:47 2014 +0300

    Set up the instdir_for_build URE unorc file when cross-compiling
    
    Change-Id: Icde8c214f510d168b52f2594821071a5aff19ecf

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 11aae8e..2642a53 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 	i18nlangtag \
 	i18nutil \
 	i18npool \
+	instsetoo_native \
 	idl \
 	io \
 	javaunohelper \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 05ac6d1..e5604b9 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -42,5 +42,6 @@ gb_BUILD_TOOLS = \
 	$(foreach executable, \
 		xsltproc \
 	,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
+	$(INSTDIR)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list