diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-02-22 16:31:03 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-02-22 16:31:03 +0000 |
| commit | 2eef8353822c123dc6aafc7cfc035c11894f9bf4 (patch) | |
| tree | f53740af79d8f51fae42d963c2c277c7f56fd994 /libio/config.shared | |
| parent | 47f17659a55be6700326a02f970be4f2e10f2c41 (diff) | |
| download | ppe42-gcc-2eef8353822c123dc6aafc7cfc035c11894f9bf4.tar.gz ppe42-gcc-2eef8353822c123dc6aafc7cfc035c11894f9bf4.zip | |
* 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 "../".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18168 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio/config.shared')
| -rw-r--r-- | libio/config.shared | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/config.shared b/libio/config.shared index 9dcfb551d9d..cbaf2900dfb 100644 --- a/libio/config.shared +++ b/libio/config.shared @@ -33,7 +33,7 @@ else TO_REAL_TOPDIR="${TO_TOPDIR}" fi 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 "" @@ -164,7 +164,7 @@ if test "${DOING_LIBGXX}" = "true" ; then echo '# IO_DIR = no-stream' elif test "${DOING_GPERF}" = "true" ; then echo "IO_DIR = libio" - echo "LIBS = -L../libstdc++ -lstdc++" + echo "LIBS = -L${TO_TOPDIR}libstdc++ -lstdc++" fi if [ -z "${ALL}" ] ; then @@ -241,7 +241,7 @@ echo >&2 'NOSTDINC = -nostdinc++' if test -n "${XCXXINCLUDES}" ; then echo >&2 "CXXINCLUDES = ${XCXXINCLUDES} "'$(NOSTDINC)' 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 if test -n "${XCINCLUDES}" ; then echo >&2 "CINCLUDES = ${XCINCLUDES}" |
