Skip to content

R
riscv-gcc-1
Commit 88101ab9 by H.J. Lu Committed by Jeff Law
Options

configure (gxx_include_dir): Removed. 

	* configure (gxx_include_dir): Removed.
	* configure.in (gxx_include_dir): Handle it.
	* Makefile.in: Likewise.
	* libio/configure.in (gxx_include_dir): Handle it.
	* libio/Makefile.in: Likewise.
	* libstdc++/configure.in (gxx_include_dir): Handle it.
	* libstdc++/Makefile.in: Likewise.

From-SVN: r26126
parent 09b893bb
Showing with 108 additions and 29 deletions
ChangeLog
Fri Apr 2 15:11:32 1999 H.J. Lu (hjl@gnu.org)
* configure (gxx_include_dir): Removed.
* configure.in (gxx_include_dir): Handle it.
* Makefile.in: Likewise.
Thu Mar 18 00:17:50 1999 Mark Elbrecht <snowball3@usa.net>
* config/mh-go32: Delete.
......
Makefile.in
......@@ -35,6 +35,7 @@ includedir=${prefix}/include
oldincludedir=/usr/include
infodir=${prefix}/info
mandir=${prefix}/man
gxx_include_dir=${includedir}/g++
tooldir = $(exec_prefix)/$(target_alias)
build_tooldir = $(exec_prefix)/$(target_alias)
......
configure
......@@ -1331,35 +1331,6 @@ EOF
echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
fi
# provide a proper gxx_include_dir to all subdirs.
# Note, if you change the default, make sure to fix both here
# and in the gcc subdirectory.
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
gxx_include_dir=
if test -n "${with_gxx_include_dir}"; then
case "${with_gxx_include_dir}" in
yes )
echo "configure: error: bad value ${withval} given for g++ include directory" 1>&2
exit 1
;;
no )
;;
* )
gxx_include_dir=${with_gxx_include_dir}
;;
esac
fi
if test x${gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
echo gxx_include_dir = '${libsubdir}/include/g++' >> ${Makefile}
else
. ${topsrcdir}/config.if
echo gxx_include_dir = '${prefix}/include/g++'-${libstdcxx_interface} >> ${Makefile}
fi
else
echo gxx_include_dir = ${gxx_include_dir} >> ${Makefile}
fi
# record if we want to build shared libs.
if test -z "${enable_shared}"; then
echo enable_shared = no >> ${Makefile}
......
configure.in
......@@ -1080,10 +1080,40 @@ if [ x${with_newlib} != xno ] && echo " ${target_configdirs} " | grep " newlib "
targargs="--with-newlib ${targargs}"
fi
# provide a proper gxx_include_dir.
# Note, if you change the default, make sure to fix both here and in
# the gcc, libio, libstdc++ and libg++ subdirectories.
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
gxx_include_dir=
if test -n "${with_gxx_include_dir}"; then
case "${with_gxx_include_dir}" in
yes )
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
exit 1
;;
no )
;;
* )
gxx_include_dir=${with_gxx_include_dir}
;;
esac
fi
if test x${gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
gxx_include_dir='${libsubdir}/include/g++'
else
. ${topsrcdir}/config.if
gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
fi
else
gxx_include_dir=${gxx_include_dir}
fi
targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
sed -e "s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
-e "s%^CONFIG_ARGUMENTS[ ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
-e "s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
-e "s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}%" \
Makefile > Makefile.tem
rm -f Makefile
mv -f Makefile.tem Makefile
......
libio/ChangeLog
Fri Apr 2 15:11:58 1999 H.J. Lu (hjl@gnu.org)
* libio/configure.in (gxx_include_dir): Handle it.
* libio/Makefile.in: Likewise.
Wed Mar 24 22:36:45 1999 Mumit Khan <khan@xraylith.wisc.edu>
* configure.in (EXEEXT): Define.
......
libio/Makefile.in
......@@ -22,6 +22,7 @@ VERSION = 2.8.0
_G_CONFIG_H=_G_config.h
tooldir = $(exec_prefix)/$(target)
INSTALLDIR = $(libdir)
gxx_include_dir=${includedir}/g++
IO_OBJECTS = filedoalloc.o floatconv.o genops.o fileops.o \
iovfprintf.o \
......
libio/configure.in
......@@ -178,3 +178,32 @@ if [ -n "${with_cross_host}" ] ; then
fi
. ${topsrcdir}/config-ml.in
gxx_include_dir=
# Specify the g++ header file directory
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir"
case "${withval}" in
yes)
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
exit 1
;;
no) ;;
*) gxx_include_dir=$with_gxx_include_dir ;;
esac
fi
if test x${gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
gxx_include_dir='${libsubdir}/include/g++'
else
topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
fi
fi
rm -f Makefile.tem
sed -e "s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}%" \
Makefile >Makefile.tem
mv -f Makefile.tem Makefile
libstdc++/ChangeLog
Fri Apr 2 15:12:14 1999 H.J. Lu (hjl@gnu.org)
* libstdc++/configure.in (gxx_include_dir): Handle it.
* libstdc++/Makefile.in: Likewise.
Wed Mar 24 22:36:45 1999 Mumit Khan <khan@xraylith.wisc.edu>
* configure.in (EXEEXT): Define.
......
libstdc++/Makefile.in
......@@ -17,6 +17,8 @@
VERSION = 2.9.0
INTERFACE = 2
gxx_include_dir=${includedir}/g++
OBJS = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o
SUBLIBS = $(STAMP)-string $(STAMP)-complx
......
libstdc++/configure.in
......@@ -177,3 +177,31 @@ if [ -n "${with_cross_host}" ] ; then
fi
. ${topsrcdir}/config-ml.in
gxx_include_dir=
# Specify the g++ header file directory
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir"
case "${withval}" in
yes)
echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
exit 1
;;
no) ;;
*) gxx_include_dir=$with_gxx_include_dir ;;
esac
fi
if test x${gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
gxx_include_dir='${libsubdir}/include/g++'
else
gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
fi
fi
rm -f Makefile.tem
sed -e "s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}%" \
Makefile >Makefile.tem
mv -f Makefile.tem Makefile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment