diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-03 15:03:27 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-03 15:03:27 +0100 |
| commit | ac1a3a5d5b5b666066acbb3a3fa16ab778e34a99 (patch) | |
| tree | cbf3633953d4dcdb35cb28f0d5c7cbddae355602 /set_soenv.in | |
| parent | bootstrap/set_soenv: remove unused variables (diff) | |
| download | core-ac1a3a5d5b5b666066acbb3a3fa16ab778e34a99.tar.gz core-ac1a3a5d5b5b666066acbb3a3fa16ab778e34a99.zip | |
Don't add an explicit -L/usr/lib or -L/usr/lib64.
It breaks KDE3 build on SUSE.
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/set_soenv.in b/set_soenv.in index 593ad5b8c464..d20e497aadf3 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1335,8 +1335,10 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd/) $L.$JRELIBDIR. $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. - $L_STLPORT_LIB. - $L.$XLIB; + $L_STLPORT_LIB; + if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) { + $SOLARLIB .= $L.$XLIB; + } } elsif ($platform =~ m/cygwin|os2/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. |