Remove config.if.
This commit is contained in:
parent
b96fedfb8b
commit
fdc1bab19d
@ -1,3 +1,11 @@
|
||||
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
* config.if: Delete.
|
||||
* configure.in: Set libstdcxx_incdir directly.
|
||||
* configure: Regenerate.
|
||||
* MAINTAINERS: Remove mention of config.if.
|
||||
* src-release (DEVO_SUPPORT): Remove config.if.
|
||||
|
||||
2004-12-02 Eric Christopher <echristo@redhat.com>
|
||||
|
||||
* Makefile.tpl (clean-target-libgcc): Add stmp-dirs to list
|
||||
|
@ -96,7 +96,7 @@ winsup/
|
||||
See also winsup/MAINTAINERS.
|
||||
|
||||
config-ml.in; setup.com; missing; makefile.vms; utils/; config/;
|
||||
config.if; makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
|
||||
makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
|
||||
Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry.
|
||||
|
||||
modules file
|
||||
|
37
config.if
37
config.if
@ -1,37 +0,0 @@
|
||||
#! /dev/null
|
||||
# Don't call it directly. This shell script fragment is called to
|
||||
# determine:
|
||||
#
|
||||
# 1. libstcxx_incdir: the interface name for libstdc++.
|
||||
#
|
||||
|
||||
# Get the top level src dir.
|
||||
if [ -z "${topsrcdir}" -a -z "${top_srcdir}" ]
|
||||
then
|
||||
echo "Undefined top level src dir: topsrcdir and top_srcdir are empty" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "${topsrcdir}" ]
|
||||
then
|
||||
if_topsrcdir=${topsrcdir}
|
||||
else
|
||||
if_topsrcdir=${top_srcdir}
|
||||
fi
|
||||
|
||||
# Set libstdcxx_incdir.
|
||||
# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4.
|
||||
if test -z "$gcc_version"; then
|
||||
if test -z "${gcc_version_trigger}" \
|
||||
&& test -f ${if_topsrcdir}/gcc/version.c; then
|
||||
gcc_version_trigger=${if_topsrcdir}/gcc/version.c
|
||||
fi
|
||||
if test -f "${gcc_version_trigger}"; then
|
||||
gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
|
||||
else
|
||||
gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
|
||||
fi
|
||||
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
||||
fi
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
|
2
configure
vendored
2
configure
vendored
@ -3387,7 +3387,7 @@ case "${with_gxx_include_dir}" in
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
. ${srcdir}/config.if
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
|
@ -1974,7 +1974,7 @@ case "${with_gxx_include_dir}" in
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
. ${srcdir}/config.if
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
|
@ -44,7 +44,7 @@ PWD = $${PWDCMD-pwd}
|
||||
# ChangeLog omitted because it may refer to files which are not in this
|
||||
# distribution (perhaps it would be better to include it anyway).
|
||||
DEVO_SUPPORT= README Makefile.in configure configure.in \
|
||||
config.guess config.if config.sub config move-if-change \
|
||||
config.guess config.sub config move-if-change \
|
||||
COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
|
||||
mkinstalldirs ltconfig ltmain.sh missing ylwrap \
|
||||
libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \
|
||||
|
Loading…
Reference in New Issue
Block a user