git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: For *-*-cygwin32*, add a -I for winsup to both XCINCLUDES and XCXXINCLUDES. 

* configure.in: For *-*-cygwin32*, add a -I for winsup to both
	XCINCLUDES and XCXXINCLUDES.
	* config.shared: Use ${host_includes} when setting CXXINCLUDES in
	the DOING_LIBGXX case.
	* Makefile.in (_G_config.h): Pass $(CINCLUDES) in CC and
	$(CXXINCLUDES) in CXX when running gen-params.
	* config.shared (THIS_FILE): Really found via TOLIBIO instead
	of TOLIBCXX, which is empty when configuring gperf.
	(LIBS): When linking gperf, find libstdc++ relative to TO_TOPDIR
	instead of hardcoded "../".

From-SVN: r18168
This commit is contained in:
Jeff Law 1998-02-22 09:31:03 -07:00
parent 9c37957a85
commit 2b63596afe
4 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libio/ChangeLog
View File

@ -1,3 +1,9 @@
Sun Feb 22 17:24:53 1998 Jeffrey A Law (law@cygnus.com)
* config.shared: Bring back changes from Ian and Fred that were
accidentally clobbered. Should eliminate the need for Dave's
recent change.
Tue Feb 17 21:56:25 1998 H.J. Lu (hjl@gnu.org) Tue Feb 17 21:56:25 1998 H.J. Lu (hjl@gnu.org)
* config/linux.mt (IO_OBJECTS): Add iogetline.o. * config/linux.mt (IO_OBJECTS): Add iogetline.o.
@ -34,6 +40,11 @@ Fri Feb 6 01:35:56 1998 Manfred Hollstein <manfred@s-direktnet.de>
(.cc.o): Dito. (.cc.o): Dito.
(stamp-picdir): Dito. (stamp-picdir): Dito.
Thu Feb 5 17:41:26 1998 Dave Brolley <brolley@cygnus.com>
* config.shared (LIBS): Change to -L../../libstdc++ (was -L../libstdc++)
if ${DOING_GPERF} is true.
1998-01-20 Andreas Schwab (schwab@issan.informatik.uni-dortmund.de) 1998-01-20 Andreas Schwab (schwab@issan.informatik.uni-dortmund.de)
* iostream.cc (istream::operator>>(long double&)) * iostream.cc (istream::operator>>(long double&))
@ -107,7 +118,16 @@ Fri Jan 16 00:48:03 1998 Manfred Hollstein <manfred@lts.sel.alcatel.de>
* config.shared (FLAGS_TO_PASS): Add SHELL. * config.shared (FLAGS_TO_PASS): Add SHELL.
Tue Jan 13 21:30:33 1998 H.J. Lu (hjl@gnu.org) Thu Jan 15 00:21:58 1998 Ian Lance Taylor <ian@cygnus.com>
* configure.in: For *-*-cygwin32*, add a -I for winsup to both
XCINCLUDES and XCXXINCLUDES.
* config.shared: Use ${host_includes} when setting CXXINCLUDES in
the DOING_LIBGXX case.
* Makefile.in (_G_config.h): Pass $(CINCLUDES) in CC and
$(CXXINCLUDES) in CXX when running gen-params.
Tue Jan 13 21:32:08 1998 H.J. Lu (hjl@gnu.org)
* configure.in (CHECK_SUBDIRS): Set to testsuite only if * configure.in (CHECK_SUBDIRS): Set to testsuite only if
${srcdir}/../gcc exists. ${srcdir}/../gcc exists.
@ -118,6 +138,13 @@ Tue Jan 13 21:30:33 1998 H.J. Lu (hjl@gnu.org)
* tests/configure.in (CHECK): Set to "check-iostream * tests/configure.in (CHECK): Set to "check-iostream
check-stdio" if ${srcdir}/../../gcc doesn't exists. check-stdio" if ${srcdir}/../../gcc doesn't exists.
Thu Jan 8 18:09:03 1998 Fred Fish <fnf@cygnus.com>
* config.shared (THIS_FILE): Really found via TOLIBIO instead
of TOLIBCXX, which is empty when configuring gperf.
(LIBS): When linking gperf, find libstdc++ relative to TO_TOPDIR
instead of hardcoded "../".
1997-12-12 Brendan Kehoe <brendan@lisa.cygnus.com> 1997-12-12 Brendan Kehoe <brendan@lisa.cygnus.com>
Don't make gperf depend upon libg++. Don't make gperf depend upon libg++.

6
libio/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 1993, 1995 Free Software Foundation # Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation
# #
# This file is part of the GNU IO Library. This library is free # This file is part of the GNU IO Library. This library is free
# software; you can redistribute it and/or modify it under the # software; you can redistribute it and/or modify it under the
@ -97,8 +97,8 @@ stmp-stdio:
_G_config.h: ${srcdir}/gen-params _G_config.h: ${srcdir}/gen-params
rootme=`pwd`/ ; export rootme; \ rootme=`pwd`/ ; export rootme; \
CC="$(CC)"; export CC; \ CC="$(CC) $(CINCLUDES)"; export CC; \
CXX="$(CXX) $(NOSTDINC) $(CXXFLAGS)"; export CXX; \ CXX="$(CXX) $(CXXINCLUDES) $(NOSTDINC) $(CXXFLAGS)"; export CXX; \
CONFIG_NM="$(NM)"; export CONFIG_NM; \ CONFIG_NM="$(NM)"; export CONFIG_NM; \
$(SHELL) ${srcdir}/gen-params LIB_VERSION=$(VERSION) $(G_CONFIG_ARGS) >tmp-params.h $(SHELL) ${srcdir}/gen-params LIB_VERSION=$(VERSION) $(G_CONFIG_ARGS) >tmp-params.h
mv tmp-params.h _G_config.h mv tmp-params.h _G_config.h

6
libio/config.shared
View File

@ -33,7 +33,7 @@ else
TO_REAL_TOPDIR="${TO_TOPDIR}" TO_REAL_TOPDIR="${TO_TOPDIR}"
fi fi
DOING_LIBGXX=${DOING_LIBGXX-false} DOING_LIBGXX=${DOING_LIBGXX-false}
THIS_FILE="${srcdir}/${TOLIBGXX}config.shared" THIS_FILE="${srcdir}/${TOLIBIO}config.shared"
echo "# Start of package fragment generated by ${THIS_FILE}." echo "# Start of package fragment generated by ${THIS_FILE}."
echo "" echo ""
@ -164,7 +164,7 @@ if test "${DOING_LIBGXX}" = "true" ; then
echo '# IO_DIR = no-stream' echo '# IO_DIR = no-stream'
elif test "${DOING_GPERF}" = "true" ; then elif test "${DOING_GPERF}" = "true" ; then
echo "IO_DIR = libio" echo "IO_DIR = libio"
echo "LIBS = -L../libstdc++ -lstdc++" echo "LIBS = -L${TO_TOPDIR}libstdc++ -lstdc++"
fi fi
if [ -z "${ALL}" ] ; then if [ -z "${ALL}" ] ; then
@ -241,7 +241,7 @@ echo >&2 'NOSTDINC = -nostdinc++'
if test -n "${XCXXINCLUDES}" ; then if test -n "${XCXXINCLUDES}" ; then
echo >&2 "CXXINCLUDES = ${XCXXINCLUDES} "'$(NOSTDINC)' echo >&2 "CXXINCLUDES = ${XCXXINCLUDES} "'$(NOSTDINC)'
elif test "${DOING_LIBGXX}" = "true" ; then elif test "${DOING_LIBGXX}" = "true" ; then
echo >&2 'CXXINCLUDES = $(NOSTDINC) -I. -I'"${TO_TOPDIR}libio"' -I$(srcdir) -I$(srcdir)/'"${TOLIBGXX}"'$(IO_DIR) -I$(srcdir)/'"${TOLIBGXX}"'../libstdc++ -I$(srcdir)/'"${TOLIBGXX}src"' $(WRAP_C_INCLUDES)' echo >&2 'CXXINCLUDES = $(NOSTDINC) -I. -I'"${TO_TOPDIR}libio"' -I$(srcdir) -I$(srcdir)/'"${TOLIBGXX}"'$(IO_DIR) -I$(srcdir)/'"${TOLIBGXX}"'../libstdc++ -I$(srcdir)/'"${TOLIBGXX}src"' '"${host_includes}"' $(WRAP_C_INCLUDES)'
fi fi
if test -n "${XCINCLUDES}" ; then if test -n "${XCINCLUDES}" ; then
echo >&2 "CINCLUDES = ${XCINCLUDES}" echo >&2 "CINCLUDES = ${XCINCLUDES}"

12
libio/configure.in
View File

@ -107,8 +107,16 @@ ${moveifchange} temp.mt target-mkfrag
LIBDIR=yes LIBDIR=yes
TO_TOPDIR=../ TO_TOPDIR=../
ALL='$(_G_CONFIG_H) libio.a libiostream.a iostream.list' ALL='$(_G_CONFIG_H) libio.a libiostream.a iostream.list'
XCINCLUDES='-I. -I$(srcdir)' case "${target}" in
XCXXINCLUDES='-I. -I$(srcdir)' *-*-cygwin32*)
XCINCLUDES='-I. -I$(srcdir) -I$(srcdir)/../winsup/include'
XCXXINCLUDES='-I. -I$(srcdir) -I$(srcdir)/../winsup/include'
;;
*)
XCINCLUDES='-I. -I$(srcdir)'
XCXXINCLUDES='-I. -I$(srcdir)'
;;
esac
MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list' MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list'
DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag multilib.out' DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag multilib.out'
CLEAN='_G_config.h *.a' CLEAN='_G_config.h *.a'