diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-02-13 22:00:06 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-02-14 15:03:31 +0100 |
| commit | 342ea409a6cb862db50514d1bc18c86e234b9387 (patch) | |
| tree | 828c4b9c8d67ab2f8236d273aba3a94817d6ea87 /bridges | |
| parent | cb0ace39523acb14ced26ff6f349d228884f02b6 (diff) | |
iOS, use gcc3 mac code for simulator
Refer to the mac code, instead of copying it to gcc3_ios, when
running in simulator.
There is a problem with the macro calls, so the reference to the sources
are duplicated.
Change-Id: I72848ba960b8a7f85708723bfeb682ceecc1e448
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index b64b97e6f22b..3d84bdb25970 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -10,9 +10,14 @@ $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) ifeq ($(OS),IOS) +ifeq ($(CPUNAME),X86_64) +bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64 +bridge_noopt_objects := cpp2uno except uno2cpp abi call callvirtualmethod +else bridges_SELECTED_BRIDGE := gcc3_ios bridge_noopt_objects := cpp2uno cpp2uno-simulator except uno2cpp uno2cpp-simulator callvirtualmethod abi call bridge_asm_objects := ios64_helper +endif else ifeq ($(CPUNAME),ARM) |