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

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/TargetLocations.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b6400d72fe4112b230ffe31b9bea7d2a7f2f9f4
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Sep 23 11:30:27 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 23 12:15:52 2021 +0200

    Look for the udkapi types.rdb file in the right place when cross-compiling
    
    Fixes cross-compilation to iOS on macOS.
    
    Previously is was looking for
      instdir_for_build/LibreOfficeDev.app/Contents/program/types.rdb
    
    The correct location is
      instdir_for_build/LibreOfficeDev.app/Contents/Resources/ure/share/misc/types.rdb
    
    Now it is possible to build the master branch for iOS again. (No idea
    whether it works.)
    
    Change-Id: If5b09c77601b5a5136c26e1d383654a85b6cc795
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122516
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 454c167cb318..62deb5122ec0 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,7 +29,7 @@ gb_PackagePart_get_destinations = \
 
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
-gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
+gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
 # workdir target patterns