diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-17 16:26:47 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-17 16:29:34 +0300 |
| commit | c42d2a5c7a195c6d80160567a098d1387de741e5 (patch) | |
| tree | f155830aa6e720887298df574dab0622b7967b41 | |
| parent | fdo#60712 - Inherits cell styles in inserting rows/columns (diff) | |
| download | core-c42d2a5c7a195c6d80160567a098d1387de741e5.tar.gz core-c42d2a5c7a195c6d80160567a098d1387de741e5.zip | |
Set up the instdir_for_build URE unorc file when cross-compiling
Change-Id: Icde8c214f510d168b52f2594821071a5aff19ecf
| -rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 11aae8eab25d..2642a53f4a51 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 05ac6d131ca3..e5604b97ddfe 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: |