diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-21 22:16:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-21 22:20:05 +0300 |
| commit | 3d12239031a31816c47acf6ce72e14c00f67dc2a (patch) | |
| tree | fce75e34046a36ce8f8b65d252ac4956822e3dd2 /set_soenv.in | |
| parent | ae58f5193382116c3460a439bbfc58d7d50c8469 (diff) | |
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.
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/set_soenv.in b/set_soenv.in index 9ff4b034f1e7..ee92252184f4 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; |