diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-19 09:44:38 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-19 14:02:51 +0200 |
| commit | 7e1489bb4c2d11380d28cea2c3cf5d76303eecae (patch) | |
| tree | e708e5d6f6a8cf6e9d2de88fcc0ea8a58f0d4d36 /bridges/Library_cpp_uno.mk | |
| parent | 2e9eff7380484f3317bf03464b564ae80adfb7d3 (diff) | |
iOS, remove support for 32bit (arm).
Supporting 32bit iOS, means a.o. adding several libraries to
the dependency list because macOSX does not install them by
default (e.g. zlib).
32bit is only used in old iPhones.
updated configure.ac
removed from solenv/gbuild/platform
bridges corrected
Change-Id: I415e744a9cb4acb3b5fbfca33c22940a1d56e390
Diffstat (limited to 'bridges/Library_cpp_uno.mk')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 086cb6f566a8..993342baea58 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -10,18 +10,8 @@ $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) ifeq ($(OS),IOS) -bridges_SELECTED_BRIDGE := gcc3_ios_arm -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)) +bridges_SELECTED_BRIDGE := gcc3_ios +bridge_noopt_objects := cpp2uno cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm64 uno2cpp-i386 else ifeq ($(CPUNAME),ARM) |