From 342ea409a6cb862db50514d1bc18c86e234b9387 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 13 Feb 2018 22:00:06 +0100 Subject: 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 --- bridges/Library_cpp_uno.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bridges') 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) -- cgit