acinclude.m4: Check for native targets that can't link at this point in the build.

* acinclude.m4: Check for native targets that can't link at
this point in the build.
* aclocal.m4: Regenerate.
* configure: Regenerate.

From-SVN: r62679

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 703000de4070d501531e1934220a35537dce7ea0..2712b3a13a32de658bbada55db468b3cf169f797 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-11  DJ Delorie  <dj@redhat.com>
+
+       * acinclude.m4: Check for native targets that can't link at
+       this point in the build.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2003-02-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * hppa/atomicity.h (__Atomicity_lock<__inst>::_S_atomicity_lock):

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 2c705625d034f986bd2cf3aad10388e25de5101d..c7f69c8205143f76c3d5140c99c4af6cf1258f50 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2128,9 +2128,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
   # Don't do ABI checking unless native.
   AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
-                 test x"$build" = x"$host" && test -z "$with_cross_host")
+                 test x"$build" = x"$host" && test -z "$with_cross_host" \
+                && test "$enable_abi_check" = yes )
 ])
 
 

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 311bc45f325e561876a86ebfbbadbcba5d54d95b..24657eed0296b00e06c5f67439a441be2add7d50 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -2140,9 +2140,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
   # Don't do ABI checking unless native.
   AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
-                 test x"$build" = x"$host" && test -z "$with_cross_host")
+                 test x"$build" = x"$host" && test -z "$with_cross_host" \
+                && test "$enable_abi_check" = yes )
 ])
 
 

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 3e32041ad6ee840893c2f7e4551b6e6e09040ef7..eadc4be2b613a5fb5f08855bf4317ef2f9ce965f 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -23525,7 +23525,13 @@ done
   # Don't do ABI checking unless native.
   
 
-if test x"$build" = x"$host" && test -z "$with_cross_host"; then
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
+if test x"$build" = x"$host" && test -z "$with_cross_host" \
+                && test "$enable_abi_check" = yes ; then
   GLIBCPP_BUILD_ABI_CHECK_TRUE=
   GLIBCPP_BUILD_ABI_CHECK_FALSE='#'
 else