* config.if: Copy from GCC.
This commit is contained in:
parent
ba6e108396
commit
ca8def3d9a
@ -1,3 +1,7 @@
|
|||||||
|
2003-01-30 Alexandre Oliva <aoliva@redhat.com>
|
||||||
|
|
||||||
|
* config.if: Copy from GCC.
|
||||||
|
|
||||||
2003-01-27 Phil Edwards <pme@gcc.gnu.org>
|
2003-01-27 Phil Edwards <pme@gcc.gnu.org>
|
||||||
|
|
||||||
* configure.in: Revert 24Jan change.
|
* configure.in: Revert 24Jan change.
|
||||||
|
35
config.if
35
config.if
@ -2,9 +2,8 @@
|
|||||||
# Don't call it directly. This shell script fragment is called to
|
# Don't call it directly. This shell script fragment is called to
|
||||||
# determine:
|
# determine:
|
||||||
#
|
#
|
||||||
# 1. libstcxx_interface: the interface name for libstdc++.
|
# 1. libstcxx_incdir: the interface name for libstdc++.
|
||||||
# 2. cxx_interface: the interface name for c++.
|
# 2. libc_interface: the interface name for libc.
|
||||||
# 3. libc_interface: the interface name for libc.
|
|
||||||
#
|
#
|
||||||
|
|
||||||
# Get the top level src dir.
|
# Get the top level src dir.
|
||||||
@ -21,25 +20,21 @@ else
|
|||||||
if_topsrcdir=${top_srcdir}
|
if_topsrcdir=${top_srcdir}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${enable_libstdcxx_v3}" = "yes" ] ; then
|
# Set libstdcxx_incdir.
|
||||||
libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3
|
# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4.
|
||||||
else
|
if test -z "$gcc_version"; then
|
||||||
libstdcxx_srcdir=${if_topsrcdir}/libstdc++
|
if test -z "${gcc_version_trigger}" \
|
||||||
|
&& test -f ${if_topsrcdir}/gcc/version.c; then
|
||||||
|
gcc_version_trigger=${if_topsrcdir}/gcc/version.c
|
||||||
fi
|
fi
|
||||||
|
if test -f "${gcc_version_trigger}"; then
|
||||||
if [ -f ${libstdcxx_srcdir}/Makefile.in ]; then
|
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
|
||||||
# We check libstdc++ for libstdcxx_interface.
|
|
||||||
libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'`
|
|
||||||
else
|
else
|
||||||
libstdcxx_interface=
|
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
|
||||||
fi
|
fi
|
||||||
|
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
||||||
if [ -f ${if_topsrcdir}/gcc/cp/Makefile.in ]; then
|
|
||||||
# We check gcc/cp for cxx_interface.
|
|
||||||
cxx_interface=`grep "^INTERFACE" ${if_topsrcdir}/gcc/cp/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'`
|
|
||||||
else
|
|
||||||
cxx_interface=
|
|
||||||
fi
|
fi
|
||||||
|
libstdcxx_incdir=c++/${gcc_version}
|
||||||
|
|
||||||
# The trickiest part is libc_interface.
|
# The trickiest part is libc_interface.
|
||||||
if [ -z "${libc_interface}" ]
|
if [ -z "${libc_interface}" ]
|
||||||
@ -82,8 +77,8 @@ EOF
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Cross compiling. Assume glibc 2.2.
|
# Cross compiling. Assume glibc 2.1.
|
||||||
libc_interface=-libc6.2-
|
libc_interface=-libc6.1-
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
Loading…
Reference in New Issue
Block a user