[Libreoffice-commits] .: set_soenv.in

[Tor Lillqvist]

 set_soenv.in |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 8dc7fe57785088daef10a3ae12a005cf31a58aeb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jul 21 22:16:07 2011 +0300

    Using -L/lib and -L/usr/lib on MacOSX builds is unnecessary and wrong
    
    As we build against the MacOSX 10.4 SDK we should certainly not link
    against any libraries of the build OS, which could well be 10.5, 10.6
    or 10.7.
    
    Norbert verified that this works fine.

diff --git a/set_soenv.in b/set_soenv.in
index 9ff4b03..ee92252 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1008,8 +1008,8 @@ elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
    $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
 }
 elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{  $SOLAREXTRALIB     = $L.$LIB.
-                        $L.$USR.$LIB;
+{
+  # Nothing should be needed
 }
 elsif ($platform !~ m/cygwin/ && $platform !~ m/mingw32/ && $platform !~ m/^arm-apple/)
 {  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
@@ -1292,9 +1292,6 @@ elsif ($platform =~ m/cygwin|mingw32/)
 }
 elsif ($platform =~ m/darwin/)
 {  $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;