* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS) [ solaris ]:

Don't set $postdeps to "-lCstd -lCrun" if
"-library=stlport4" set in CXXFLAGS as stlport4 C++
library incompatible with Cstd C++ library. Use
'-library=Cstd -library=Crun' instead of '-lCstd -lCrun'.
This commit is contained in:
Albert Chin 2006-08-02 13:35:30 +00:00 committed by Peter O'Gorman
parent 5f5c7b9eb8
commit 67311504b6
2 changed files with 23 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2006-08-01 Albert Chin <china@thewrittenword.com>
* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS) [ solaris ]:
Don't set $postdeps to "-lCstd -lCrun" if
"-library=stlport4" set in CXXFLAGS as stlport4 C++
library incompatible with Cstd C++ library. Use
'-library=Cstd -library=Crun' instead of '-lCstd -lCrun'.
2006-07-28 Eric Blake <ebb9@byu.net>
* libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD, LT_OUTPUT):

16
libltdl/m4/libtool.m4 vendored
View File

@ -6338,7 +6338,21 @@ linux*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(postdeps,$1)='-lCstd -lCrun'
# 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.
for cc_flag in $CXXFLAGS; do
case " $CXX $CXXFLAGS " in
*" -library=stlport4 "*)
solaris_use_stlport4=yes
;;
esac
if test "$solaris_use_stlport4" != yes; then
_LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
fi
;;
esac
;;