diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
| commit | ae83b2466043967a2f32f81ddf73b1ecb401ef18 (patch) | |
| tree | 5120dbd146af6041ae8de04db301a19ebdd7cfcc /set_soenv.in | |
| parent | bump workdir up a few levels (diff) | |
| parent | unusedcode.easy: Class SvtOptionsDrawinglayer cleanup (diff) | |
| download | core-ae83b2466043967a2f32f81ddf73b1ecb401ef18.tar.gz core-ae83b2466043967a2f32f81ddf73b1ecb401ef18.zip | |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/set_soenv.in b/set_soenv.in index aa46b863b380..8f292207449b 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; @@ -1519,7 +1516,6 @@ ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); if ("@ENABLE_DEBUG@" eq "TRUE") { ToFile( "debug", "true", "e" ); } -ToFile( "ENABLE_DEBUG_STL", "@ENABLE_DEBUG_STL@", "e" ); if ("@ENABLE_WERROR@" eq "FALSE") { ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" ); } |