OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/28125 (Cannot build cross compiler for Solaris: configure: error: Link tests are not allowed after GCC_NO_EXECUTABLES)

Browse Source 
2006-12-11  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/28125
	* acinclude.m4 (GLIBCXX_CHECK_ICONV_SUPPORT): Remove link test, ie
	AC_CHECK_LIB for libiconv. Instead, use bits of AM_ICONV.
        * configure: Regenerate.
        * scripts/testsuite_flags.in (cxxldflags): Add LIBICONV bits.

From-SVN: r119749
This commit is contained in:
Benjamin Kosnik 2006-12-11 22:17:09 +00:00 committed by Benjamin Kosnik
parent d453882913
commit d99ae870ff
4 changed files with 321 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2006-12-11 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/28125
* acinclude.m4 (GLIBCXX_CHECK_ICONV_SUPPORT): Remove link test, ie
AC_CHECK_LIB for libiconv. Instead, use bits of AM_ICONV.
* configure: Regenerate.
* scripts/testsuite_flags.in (cxxldflags): Add LIBICONV bits.
2006-12-11 Richard Guenther <rguenther@suse.de>
Paolo Carlini <pcarlini@suse.de>

21
libstdc++-v3/acinclude.m4
View File

@ -324,20 +324,30 @@ AC_DEFUN([GLIBCXX_CHECK_ICONV_SUPPORT], [
# Only continue checking if the ISO C99 headers exist and support is on.
if test x"$enable_wchar_t" = xyes; then
# From Bruno Haible's AM_ICONV, but without link tests.
# Check for existence of libiconv.a providing XPG2 wchar_t support.
# Some systems have iconv in libc, some have it in libiconv (OSF/1 and
# those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LIBICONV="$LIBICONV -L$dir/lib"; fi
done
LIBICONV="$LIBICONV -liconv"
])
if test x"$LIBICONV" != x; then
AC_MSG_NOTICE([--with-libiconv-prefix is $LIBICONV])
fi
# Use iconv for wchar_t to char conversions. As such, check for
# X/Open Portability Guide, version 2 features (XPG2).
AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
# Check for existence of libiconv.a providing XPG2 wchar_t support.
AC_CHECK_LIB(iconv, iconv, LIBICONV="-liconv")
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
AC_SUBST(LIBICONV)
AC_CHECK_FUNCS([iconv_open iconv_close iconv nl_langinfo],
[ac_XPG2funcs=yes], [ac_XPG2funcs=no])
LIBS="$ac_save_LIBS"
if test x"$ac_has_iconv_h" = xyes &&
@ -347,6 +357,7 @@ AC_DEFUN([GLIBCXX_CHECK_ICONV_SUPPORT], [
AC_DEFINE([_GLIBCXX_USE_ICONV],1,
[Define if iconv and related functions exist and are usable.])
enable_iconv=yes
AC_SUBST(LIBICONV)
fi
fi
AC_MSG_CHECKING([for enabled iconv specializations])

1225
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
libstdc++-v3/scripts/testsuite_flags.in
View File

@ -58,7 +58,7 @@ case ${query} in
echo ${PCHFLAGS}
;;
--cxxldflags)
SECTIONLDFLAGS="@SECTION_LDFLAGS@"
SECTIONLDFLAGS="@SECTION_LDFLAGS@ @LIBICONV@"
echo ${SECTIONLDFLAGS}
;;
*)