[v3] version c++ includes, 2/2, revised

Benjamin Kosnik bkoz@redhat.com
Wed Jun 26 18:38:00 GMT 2002


...and this is the corresponding revision to the toplevel patch.

tested x86/linux

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

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

Index: config.if
===================================================================
RCS file: /cvs/gcc/gcc/config.if,v
retrieving revision 1.7
diff -c -p -r1.7 config.if
*** config.if	5 Feb 2001 11:02:20 -0000	1.7
--- config.if	27 Jun 2002 01:17:00 -0000
***************
*** 2,10 ****
  # 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.
  #
  
  # Get the top level src dir.
--- 2,9 ----
  # Don't call it directly. This shell script fragment is called to
  # determine:
  #
! #	1. libstcxx_incdir: the interface name for libstdc++.
! #	2. libc_interface: the interface name for libc.
  #
  
  # Get the top level src dir.
*************** else
*** 21,32 ****
    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
  
  # The trickiest part is libc_interface.
  if [ -z "${libc_interface}" ]
--- 20,31 ----
    if_topsrcdir=${top_srcdir}
  fi
  
! # 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}" ]



More information about the Gcc-patches mailing list