Link cppu statically to gcc3_uno on iOS

cppu/inc/uno/environment.h

@@ -375,7 +375,11 @@ void SAL_CALL uno_Environment_enter(uno_Environment * pEnv)
 int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason)
     SAL_THROW_EXTERN_C();
 
-
+#ifdef IOS
+/* We link statically on iOS and have just one kind of environment */
+void SAL_CALL gcc3_uno_initEnvironment(uno_Environment *pCppEnv)
+     SAL_THROW_EXTERN_C();
+#endif
 
 #ifdef __cplusplus
 }

cppu/source/uno/lbenv.cxx

@@ -1064,6 +1064,14 @@ static bool loadEnv(OUString const  & cLibStem,
                     uno_Environment * pEnv,
                     void            * /*pContext*/)
 {
+#ifdef IOS
+    oslModule hMod;
+    uno_initEnvironmentFunc fpInit = NULL;
+
+    if (cLibStem.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gcc3_uno")) )
+        fpInit = gcc3_uno_initEnvironment;
+    osl_getModuleHandle( NULL, &hMod );
+#else
     // late init with some code from matching uno language binding
     // will be unloaded by environment
     oslModule hMod = cppu::detail::loadModule( cLibStem );
@@ -1074,6 +1082,8 @@ static bool loadEnv(OUString const  & cLibStem,
     OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT));
     uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc)
         ::osl_getFunctionSymbol( hMod, aSymbolName.pData );
+#endif
+
     if (!fpInit)
     {
         ::osl_unloadModule( hMod );

cppu/source/uno/loadmodule.cxx

@@ -41,9 +41,6 @@
 namespace cppu { namespace detail {
 
 ::oslModule loadModule(rtl::OUString const & name) {
-#ifdef IOS
-    return NULL;
-#else
     rtl::OUStringBuffer b;
 #if defined SAL_DLLPREFIX
     b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX));
@@ -54,7 +51,6 @@ namespace cppu { namespace detail {
         reinterpret_cast< oslGenericFunction >(&loadModule),
         b.makeStringAndClear().pData,
         SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY);
-#endif
 }
 
 } }

solenv/inc/libs.mk

@@ -323,8 +323,12 @@ REGLIB+=$(STORELIB)
 BOOTSTRAPUNOLIB=$(SOLARLIBDIR)/bootstrap.uno.a
 BOOTSTRAPUNOLIB+=$(SALHELPERLIB) $(REGLIB) $(XMLREADERLIB)
 
+GCC3UNOLIB=-lgcc3_uno
+
 SALLIB+=-lsal_textenc
 
+CPPULIB+=$(GCC3UNOLIB)
+
 CPPUHELPERLIB+=$(BOOTSTRAPUNOLIB)
 
 UCBHELPERLIB+=$(SALHELPERLIB)