[Libreoffice-commits] .: 2 commits - set_soenv.in solenv/inc

[Tor Lillqvist]

 set_soenv.in          |    7 ++++---
 solenv/inc/unxiosr.mk |    8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 9e2041480d36fed6a626f878e1fdb22c27e1cf3d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 9 13:37:45 2011 +0300

    Link with more frameworks

diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 3235026..2e7599e 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,10 +32,10 @@ CFLAGS=-c $(EXTRA_CFLAGS)
 LINKC*=$(CC)
 LINK*=$(CXX)
 
-STDLIBCUIMT=-framework CoreFoundation
-STDLIBGUIMT=-framework CoreFoundation
-STDSHLCUIMT=-framework CoreFoundation
-STDSHLGUIMT=-framework CoreFoundation
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBGUIMT=$(STDLIBCUIMT)
+STDSHLCUIMT=
+STDSHLGUIMT=
 
 LIBMGR*=ar
 LIBFLAGS=-r
commit e153f6697432638e9f6255af9992df16e224ecaf
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 9 13:37:20 2011 +0300

    Don't use -L /usr/lib when building for iOS

diff --git a/set_soenv.in b/set_soenv.in
index 022a86e..b632ee9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1291,13 +1291,14 @@ elsif ($platform =~ m/cygwin|mingw32/)
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
 }
 elsif ($platform =~ m/darwin/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.$USR_LIB;
+{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
+   if ($platform !~ m/^arm-apple/)
+   {  $SOLARLIB      .= $L.$USR_LIB;
+   }
     # [ed] 6/15/02 Add in X11 libraries onto the library path
     if ($GUIBASE eq "unx") {
        $SOLARLIB      .= $L.$XLIB;
     }
-
 }
 
 if ($SYSTEM_MOZILLA eq "YES")