diff options
| author | DJ Delorie <dj@redhat.com> | 2003-02-11 00:50:01 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2003-02-11 00:50:01 -0500 |
| commit | 294901f87958f9bddd48cf0a00e2b892abeba544 (patch) | |
| tree | de575337161b5764ee4a9294ae5b91c00325f75b | |
| parent | 91adf6cf63b347d91658011603385f83322906ce (diff) | |
| download | gcc-294901f87958f9bddd48cf0a00e2b892abeba544.zip gcc-294901f87958f9bddd48cf0a00e2b892abeba544.tar.gz gcc-294901f87958f9bddd48cf0a00e2b892abeba544.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 8 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 8 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 8 |
4 files changed, 28 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 703000d..2712b3a 100644 --- 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 2c70562..c7f69c8 100644 --- 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 311bc45..24657ee 100644 --- 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 3e32041..eadc4be 100755 --- 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 |