diff options
| author | Ralf Menzel <menzel@ls6.cs.uni-dortmund.de> | 2006-08-03 14:06:36 +0000 |
|---|---|---|
| committer | Peter O'Gorman <peter@pogma.com> | 2006-08-03 14:06:36 +0000 |
| commit | f89a71b681222947d191e33c1747ba5677ce1913 (patch) | |
| tree | 6bca57b0c15680e9a6aa48b5e378c50c5d46d1ce | |
| parent | 67311504b6d06179aa1ae95e270ada4ec94b1cea (diff) | |
| download | libtool-f89a71b681222947d191e33c1747ba5677ce1913.tar.gz | |
* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues
with previous patch. for ... do' line is superflous. Need
_LT_TAGVAR not _LT_AC_TAGVAR, should be for both linux and
solaris with Sun compiler.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libltdl/m4/libtool.m4 | 17 |
2 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-08-03 Ralf Menzel <menzel@ls6.cs.uni-dortmund.de> + + * libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues + with previous patch. for ... do' line is superflous. Need + _LT_TAGVAR not _LT_AC_TAGVAR, should be for both linux and + solaris with Sun compiler. + 2006-08-01 Albert Chin <china@thewrittenword.com> * libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS) [ solaris ]: diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index db3bc7c4..c54aec17 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -6343,7 +6343,6 @@ linux*) # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as # -library=stlport4 depends on it. - for cc_flag in $CXXFLAGS; do case " $CXX $CXXFLAGS " in *" -library=stlport4 "*) solaris_use_stlport4=yes @@ -6351,7 +6350,7 @@ linux*) esac if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' fi ;; esac @@ -6360,10 +6359,22 @@ linux*) solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi ;; esac ;; |