[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[jan Iversen]

 bridges/Library_cpp_uno.mk |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 3e8746506f063380387f3db5c3f849446ab58deb
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue Jun 27 11:24:38 2017 +0200

    iOS, first attempt to get bridges compiling.
    
    Need to adapt for other iOS CPU´s
    
    Change-Id: Icb0b49265d3ec67057e57bfe5610389afe404568

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 01ee21f848fe..086cb6f566a8 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -9,17 +9,23 @@
 
 $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
 
-ifeq ($(CPUNAME),ARM)
-
 ifeq ($(OS),IOS)
-$(eval $(call gb_Library_use_sdk_api,gcc3_uno))
 bridges_SELECTED_BRIDGE := gcc3_ios_arm
-bridge_asm_objects := helper
-bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm uno2cpp-arm64 uno2cpp-i386
-$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
-	bridges/source/cpp_uno/gcc3_ios_arm \
-))
-else ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
+bridge_noopt_objects := cpp2uno except uno2cpp
+# HACK
+#$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
+#	$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+#$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
+#	EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+
+#$(eval $(call gb_Library_use_sdk_api,gcc3_uno))
+#bridge_asm_objects := helper
+#bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm uno2cpp-arm64 uno2cpp-i386
+#$(eval $(call gb_Library_use_custom_headers,gcc3_uno,bridges/source/cpp_uno/gcc3_ios_arm))
+
+else ifeq ($(CPUNAME),ARM)
+
+ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_arm
 bridge_noopt_objects := cpp2uno except uno2cpp
 # HACK