From c5c7fc0432b295935f987c8af64fa41b784699b6 Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Sun, 24 Jul 2005 12:20:43 +0000 Subject: [PATCH] * m4/libtool.m4 (CXX, archive_cmds) [sun]: Add -lCstd, -lCrun and -lc for c++ builds with Sun C++ and Centerline C++.. Reported by Albert Chin-A-Young --- ChangeLog | 6 ++++++ m4/libtool.m4 | 16 +++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18470976..f2669fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-23 Peter O'Gorman + + * m4/libtool.m4 (CXX, archive_cmds) [sun]: Add -lCstd, -lCrun + and -lc for c++ builds with Sun C++ and Centerline C++.. + Reported by Albert Chin-A-Young + 2005-07-11 Ralf Wildenhues * m4/libtool.m4 (_LT_CHECK_XSI_SHELL): Fix bogus merge. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 29cf58f8..d8c5bd32 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -5542,10 +5542,12 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(postdeps,$1)='-lCstd -lCrun' _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5565,15 +5567,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is -- 2.11.4.GIT