From 5ebf24527636bf9845c52a262f5ce34aca6abcad Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Tue, 15 Nov 2005 04:56:34 +0000 Subject: * acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Don't check for shared libgcc for darwin exports. * configure: Regenerate. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@106936 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/acinclude.m4 | 26 ++++++++++---------------- libstdc++-v3/configure | 32 +++++++++++++------------------- 3 files changed, 29 insertions(+), 35 deletions(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f60ef609999..0fa50390352 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2005-11-14 Geoffrey Keating + + * acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Don't check for + shared libgcc for darwin exports. + * configure: Regenerate. + 2005-11-13 Jonathan Wakely * include/tr1/boost_shared_ptr.h (get_deleter): diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index c4d31d93a13..f4d11bfabbf 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1711,8 +1711,9 @@ if test x$enable_symvers = xyes ; then fi fi -# Check to see if libgcc_s exists, indicating that shared libgcc is possible. -if test $enable_symvers != no; then +# Check to see if 'gnu' can win. +if test $enable_symvers = gnu; then + # Check to see if libgcc_s exists, indicating that shared libgcc is possible. AC_MSG_CHECKING([for shared libgcc]) ac_save_CFLAGS="$CFLAGS" CFLAGS=' -lgcc_s' @@ -1736,25 +1737,18 @@ changequote([,])dnl fi fi AC_MSG_RESULT($glibcxx_shared_libgcc) -fi - -# If no shared libgcc, can't win. -if test $glibcxx_shared_libgcc != yes && - test $enable_symvers != no ; then - AC_MSG_WARN([=== You have requested some kind of symbol versioning, but]) - AC_MSG_WARN([=== you are not building a shared libgcc_s.]) - AC_MSG_WARN([=== Symbol versioning will be disabled.]) - enable_symvers=no - enable_symvers=no -fi -# Check to see if 'gnu' can win. -if test $enable_symvers = gnu; then # For GNU ld, we need at least this version. The format is described in # GLIBCXX_CHECK_LINKER_FEATURES above. glibcxx_min_gnu_ld_version=21400 - if test $with_gnu_ld != yes ; then + # If no shared libgcc, can't win. + if test $glibcxx_shared_libgcc != yes; then + AC_MSG_WARN([=== You have requested GNU symbol versioning, but]) + AC_MSG_WARN([=== you are not building a shared libgcc_s.]) + AC_MSG_WARN([=== Symbol versioning will be disabled.]) + enable_symvers=no + elif test $with_gnu_ld != yes ; then # just fail for now AC_MSG_WARN([=== You have requested GNU symbol versioning, but]) AC_MSG_WARN([=== you are not using the GNU linker.]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index fb830d4a103..21a20bc427a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -87275,8 +87275,9 @@ echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} fi fi -# Check to see if libgcc_s exists, indicating that shared libgcc is possible. -if test $enable_symvers != no; then +# Check to see if 'gnu' can win. +if test $enable_symvers = gnu; then + # Check to see if libgcc_s exists, indicating that shared libgcc is possible. echo "$as_me:$LINENO: checking for shared libgcc" >&5 echo $ECHO_N "checking for shared libgcc... $ECHO_C" >&6 ac_save_CFLAGS="$CFLAGS" @@ -87399,28 +87400,21 @@ rm -f conftest.err conftest.$ac_objext \ fi echo "$as_me:$LINENO: result: $glibcxx_shared_libgcc" >&5 echo "${ECHO_T}$glibcxx_shared_libgcc" >&6 -fi - -# If no shared libgcc, can't win. -if test $glibcxx_shared_libgcc != yes && - test $enable_symvers != no ; then - { echo "$as_me:$LINENO: WARNING: === You have requested some kind of symbol versioning, but" >&5 -echo "$as_me: WARNING: === You have requested some kind of symbol versioning, but" >&2;} - { echo "$as_me:$LINENO: WARNING: === you are not building a shared libgcc_s." >&5 -echo "$as_me: WARNING: === you are not building a shared libgcc_s." >&2;} - { echo "$as_me:$LINENO: WARNING: === Symbol versioning will be disabled." >&5 -echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} - enable_symvers=no - enable_symvers=no -fi -# Check to see if 'gnu' can win. -if test $enable_symvers = gnu; then # For GNU ld, we need at least this version. The format is described in # GLIBCXX_CHECK_LINKER_FEATURES above. glibcxx_min_gnu_ld_version=21400 - if test $with_gnu_ld != yes ; then + # If no shared libgcc, can't win. + if test $glibcxx_shared_libgcc != yes; then + { echo "$as_me:$LINENO: WARNING: === You have requested GNU symbol versioning, but" >&5 +echo "$as_me: WARNING: === You have requested GNU symbol versioning, but" >&2;} + { echo "$as_me:$LINENO: WARNING: === you are not building a shared libgcc_s." >&5 +echo "$as_me: WARNING: === you are not building a shared libgcc_s." >&2;} + { echo "$as_me:$LINENO: WARNING: === Symbol versioning will be disabled." >&5 +echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} + enable_symvers=no + elif test $with_gnu_ld != yes ; then # just fail for now { echo "$as_me:$LINENO: WARNING: === You have requested GNU symbol versioning, but" >&5 echo "$as_me: WARNING: === You have requested GNU symbol versioning, but" >&2;} -- cgit v1.2.3