sync from gcc

2002-04-18  Tom Tromey  <tromey@redhat.com>

	* configure.in: Disallow configuring libgcj when it is already
	installed and we're using Solaris 2.8 linker.  Do enable libgcj on
	Solaris 2.8 by default.  For PR libgcj/6158.
This commit is contained in:
DJ Delorie 2002-04-19 17:36:40 +00:00
parent 6992cde2f8
commit 62cb3c073a
2 changed files with 33 additions and 9 deletions

View File

@ -2,6 +2,12 @@
* configure.in: remove references to dead files
2002-04-18 Tom Tromey <tromey@redhat.com>
* configure.in: Disallow configuring libgcj when it is already
installed and we're using Solaris 2.8 linker. Do enable libgcj on
Solaris 2.8 by default. For PR libgcj/6158.
2002-04-17 Nathanael Nerode <neroden@twcny.rr.com>
* configure.in: Move default CC setting out of config/mh-* fragments

View File

@ -1043,15 +1043,6 @@ case "${target}" in
fi
;;
sparc-*-solaris*)
case "${host}" in
sparc-*-solaris2.8)
# According to Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>, libjava
# won't build correctly on Solaris 8 if there's a
# previously-installed version of GCC in the configured prefix.
# This problem does not show up on earlier versions of Solaris.
noconfigdirs="$noconfigdirs ${libgcj}"
;;
esac
;;
v810-*-*)
noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss ${libgcj}"
@ -1425,6 +1416,33 @@ case "${host}" in
;;
esac
# If we're building libgcj and we're using the Solaris 2.8 linker,
# then we check for a known problem.
if test "x${libgcj}" = x && test "${with_gnu_ld}" != yes \
&& test "${is_cross_compiler}" = no; then
case "${host}" in
sparc-*-solaris2.8)
if test "$libdir" = '${exec_prefix}/lib';then
if test "$exec_prefix" = '$(prefix)'; then
tlibdir="$prefix/lib"
else
tlibdir="$exec_prefix/lib"
fi
else
tlibdir="$libdir"
fi
if test -f $tlibdir/libgcj.la; then
echo "*** You've already installed libgcj in $tlibdir." 1>&2
echo " This causes problems when rebuilding libgcj with the Solaris 2.8 linker." 1>&2
echo " Either disable the libgcj build, or remove the" 1>&2
echo " already-installed libgcj files." 1>&2
exit 1
fi
;;
esac
fi
# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the
# binutils tools will find libbfd.so.
if [ "${shared}" = "yes" ]; then