procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config.if (libstdcxx_incdir): Version C++ headers.

Browse source 
2002-06-26  Benjamin Kosnik  <bkoz@redhat.com>

	* config.if (libstdcxx_incdir): Version C++ headers.
	(cxx_incdir): Remove.

From-SVN: r55029
This commit is contained in:
Benjamin Kosnik 2002-06-27 10:19:53 +00:00 • committed by Benjamin Kosnik
parent 41970073a9
commit 53c40185d0
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-06-26 Benjamin Kosnik <bkoz@redhat.com>
* config.if (libstdcxx_incdir): Version C++ headers.
(cxx_incdir): Remove.
2002-06-25 Nathanael Nerode <neroden@gcc.gnu.org> 2002-06-25 Nathanael Nerode <neroden@gcc.gnu.org>
* MAINTAINERS (Write After Approval): Add self. * MAINTAINERS (Write After Approval): Add self.

17
config.if
View file

@ -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,12 +20,12 @@ else
if_topsrcdir=${top_srcdir} if_topsrcdir=${top_srcdir}
fi fi
libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 # Set libstdcxx_incdir.
# We check libstdc++-v3/configure.in for libstdcxx_interface. # This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4.
libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/configure.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` gcc_version_trigger=${if_topsrcdir}/gcc/version.c
libstdcxx_incdir=g++-${libstdcxx_interface} gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
# Used to version libstdc++ shared libraries gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
cxx_interface=2 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}" ]