From 9b054dac07ef0d81386098f5659faaae32a54db3 Mon Sep 17 00:00:00 2001 From: Dave Korn Date: Wed, 29 Jul 2009 11:45:30 +0000 Subject: [PATCH] PR bootstrap/38903: Backport fix from HEAD. * configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin, as it no longer shares libiberty object files. * configure: Regenerated. From-SVN: r150209 --- libiberty/ChangeLog | 7 +++++++ libiberty/configure | 30 ------------------------------ libiberty/configure.ac | 23 ----------------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index a22fc0a6c105..86f59ae38e6d 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2009-07-29 Dave Korn + + PR bootstrap/38903: Backport fix from HEAD. + * configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin, + as it no longer shares libiberty object files. + * configure: Regenerated. + 2009-01-24 Release Manager * GCC 4.3.3 released. diff --git a/libiberty/configure b/libiberty/configure index e444bd367d87..14542e77cd31 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -6166,36 +6166,6 @@ if test -z "${setobjs}"; then case "${host}" in - *-*-cygwin*) - # The Cygwin library actually uses a couple of files from - # libiberty when it is built. If we are building a native - # Cygwin, and we run the tests, we will appear to have these - # files. However, when we go on to build winsup, we will wind up - # with a library which does not have the files, since they should - # have come from libiberty. - - # We handle this by removing the functions the winsup library - # provides from our shell variables, so that they appear to be - # missing. - - # DJ - only if we're *building* cygwin, not just building *with* cygwin - - if test -n "${with_target_subdir}" - then - funcs="`echo $funcs | sed -e 's/random//'`" - case $LIBOBJS in - "random.$ac_objext" | \ - *" random.$ac_objext" | \ - "random.$ac_objext "* | \ - *" random.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS random.$ac_objext" ;; -esac - - vars="`echo $vars | sed -e 's/sys_siglist//'`" - checkfuncs="`echo $checkfuncs | sed -e 's/strsignal//' -e 's/psignal//'`" - fi - ;; - *-*-mingw32*) # Under mingw32, sys_nerr and sys_errlist exist, but they are # macros, so the test below won't find them. diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 864db177be94..9263c82eb7c1 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -571,29 +571,6 @@ if test -z "${setobjs}"; then case "${host}" in - *-*-cygwin*) - # The Cygwin library actually uses a couple of files from - # libiberty when it is built. If we are building a native - # Cygwin, and we run the tests, we will appear to have these - # files. However, when we go on to build winsup, we will wind up - # with a library which does not have the files, since they should - # have come from libiberty. - - # We handle this by removing the functions the winsup library - # provides from our shell variables, so that they appear to be - # missing. - - # DJ - only if we're *building* cygwin, not just building *with* cygwin - - if test -n "${with_target_subdir}" - then - funcs="`echo $funcs | sed -e 's/random//'`" - AC_LIBOBJ([random]) - vars="`echo $vars | sed -e 's/sys_siglist//'`" - checkfuncs="`echo $checkfuncs | sed -e 's/strsignal//' -e 's/psignal//'`" - fi - ;; - *-*-mingw32*) # Under mingw32, sys_nerr and sys_errlist exist, but they are # macros, so the test below won't find them. -- 2.47.2