From 53c40185d0506d7d8357e8924d29aed645c83406 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 27 Jun 2002 10:19:53 +0000 Subject: [PATCH] config.if (libstdcxx_incdir): Version C++ headers. 2002-06-26 Benjamin Kosnik * config.if (libstdcxx_incdir): Version C++ headers. (cxx_incdir): Remove. From-SVN: r55029 --- ChangeLog | 5 +++++ config.if | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c478c1d94e56..0a4edda0a3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-06-26 Benjamin Kosnik + + * config.if (libstdcxx_incdir): Version C++ headers. + (cxx_incdir): Remove. + 2002-06-25 Nathanael Nerode * MAINTAINERS (Write After Approval): Add self. diff --git a/config.if b/config.if index e8978cae6643..aa35a3f8140c 100644 --- a/config.if +++ b/config.if @@ -2,9 +2,8 @@ # Don't call it directly. This shell script fragment is called to # determine: # -# 1. libstcxx_interface: the interface name for libstdc++. -# 2. cxx_interface: the interface name for c++. -# 3. libc_interface: the interface name for libc. +# 1. libstcxx_incdir: the interface name for libstdc++. +# 2. libc_interface: the interface name for libc. # # Get the top level src dir. @@ -21,12 +20,12 @@ else if_topsrcdir=${top_srcdir} fi -libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 -# We check libstdc++-v3/configure.in for libstdcxx_interface. -libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/configure.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -libstdcxx_incdir=g++-${libstdcxx_interface} -# Used to version libstdc++ shared libraries -cxx_interface=2 +# Set libstdcxx_incdir. +# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4. +gcc_version_trigger=${if_topsrcdir}/gcc/version.c +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` +gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +libstdcxx_incdir=c++/${gcc_version} # The trickiest part is libc_interface. if [ -z "${libc_interface}" ] -- 2.43.5