OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.

Browse Source 
2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.
	(libstdcxx_incdir): Pass down.
	* config.if: Remove expired bits for cxx_interface, add stub.
	(libstdcxx_incdir): Add variable for g++ include directory.
	* configure.in (gxx_include_dir): Use it.

From-SVN: r38355
This commit is contained in:
Benjamin Kosnik 2000-12-18 18:08:07 +00:00 committed by Benjamin Kosnik
parent 6e138b89b7
commit cc330df988
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2000-12-18 Benjamin Kosnik <bkoz@redhat.com>
* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.
(libstdcxx_incdir): Pass down.
* config.if: Remove expired bits for cxx_interface, add stub.
(libstdcxx_incdir): Add variable for g++ include directory.
* configure.in (gxx_include_dir): Use it.
2000-12-18 Alexandre Oliva <aoliva@redhat.com>
* MAINTAINERS: Added self as sh port co-maintainer. Removed entry

5
Makefile.in
View File

@ -370,6 +370,8 @@ BASE_FLAGS_TO_PASS = \
"libdir=$(libdir)" \
"libexecdir=$(libexecdir)" \
"lispdir=$(lispdir)" \
"libstdcxx_incdir=$(libstdcxx_incdir)" \
"libsubdir=$(libsubdir)" \
"localstatedir=$(localstatedir)" \
"mandir=$(mandir)" \
"oldincludedir=$(oldincludedir)" \
@ -382,8 +384,7 @@ BASE_FLAGS_TO_PASS = \
"gxx_include_dir=$(gxx_include_dir)" \
"gcc_version=$(gcc_version)" \
"gcc_version_trigger=$(gcc_version_trigger)" \
"target_alias=$(target_alias)" \
"libsubdir=$(libsubdir)"
"target_alias=$(target_alias)"
# Flags to pass down to most sub-makes, in which we're building with
# the host environment.

10
config.if
View File

@ -30,13 +30,9 @@ else
# We check libstdc++/Makefile.in for libstdcxx_interface.
libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'`
fi
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
libstdcxx_incdir=g++-${libstdcxx_interface}
# Used to version libstdc++ shared libraries
cxx_interface=2
# The trickiest part is libc_interface.
if [ -z "${libc_interface}" ]

2
configure.in
View File

@ -1314,7 +1314,7 @@ if test x${gxx_include_dir} = x; then
gxx_include_dir='${libsubdir}/include/g++'
else
. ${topsrcdir}/config.if
gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
gxx_include_dir='${prefix}/include/${libstdcxx_incdir}'
fi
else
gxx_include_dir=${gxx_include_dir}