diff options
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rwxr-xr-x | libiberty/configure | 30 | ||||
| -rw-r--r-- | libiberty/configure.ac | 23 |
3 files changed, 6 insertions, 53 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index b9cb199..3101aea 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2009-01-18 Dave Korn <dave.korn.cygwin@gmail.com> + + * configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin, + as it no longer shares libiberty object files. + * configure: Regenerated. + 2009-01-07 Jason Merrill <jason@redhat.com> * cp-demangle.c (d_expression): Remove mangling for zero-op casts. diff --git a/libiberty/configure b/libiberty/configure index 71b6ccd..4469808 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -6563,36 +6563,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 ff0ae6a..00fce38 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. |