ios/Executable_Viewer.mk |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 874a1bf1748dd0246a00e2a3cd4724f852e71a52
Author: Tor Lillqvist <[email protected]>
Date:   Sun Mar 3 22:04:59 2013 +0200

    The AllModulesButInstsetNative thing didn't work
    
    Change-Id: I323d1983238297b094fa0aa7776d03977d3d39e0

diff --git a/ios/Executable_Viewer.mk b/ios/Executable_Viewer.mk
index bd462d5..c3a29cb 100644
--- a/ios/Executable_Viewer.mk
+++ b/ios/Executable_Viewer.mk
@@ -27,6 +27,16 @@ $(eval $(call gb_Executable_add_objcxxobjects,Viewer,\
     ios/experimental/Viewer/Viewer/main \
 ))
 
-$(call gb_Executable_get_target,Viewer) : $(call 
gb_Postprocess_get_target,AllModulesButInstsetNative)
+# The executables built for iOS link to all LO libs statically. The
+# link command just uses the wildcard function to list all of them.
+# Instead of tediously here declare dependencies on the transitive
+# closure of those from which some object ends up being linked in, we
+# list a few libraries that are high in the dependency forest to make
+# it likely that all necessary libraries are built before this
+# executable is.
+$(eval $(call gb_Executable_use_libraries,Viewer,\
+       msword \
+       scfilt \
+))
 
 # vim: set ts=4 sw=4 et:
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to