Makefile.in: Various fixes for building cygwin32 native toolchains.

        * Makefile.in: Various fixes for building cygwin32 native toolchains.
        * Make-lang.in: Likewise.

Co-Authored-By: Geoff Noer <noer@cygnus.com>

From-SVN: r18745

3 files changed, 26 insertions, 20 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dd33cd6..b3fe9fc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 22 00:50:42 1998  Nick Clifton  <nickc@cygnus.com>
+                          Geoff Noer    <noer@cygnus.com>
+
+	* Makefile.in: Various fixes for building cygwin32 native toolchains.
+	* Make-lang.in: Likewise.
+
 Fri Mar 20 18:07:39 1998  Kriang Lerdsuwanakij  <lerdsuwa@scf.usc.edu>
 
 	* pt.c (tsubst, TEMPLATE_TEMPLATE_PARM): Simplify.
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 67fca2e..6490c7e 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -70,7 +70,7 @@ CXX_LIB2SRCS = $(srcdir)/cp/new.cc $(srcdir)/cp/new1.cc $(srcdir)/cp/new2.cc \
 # Note that it would be nice to move the dependency on g++
 # into the C++ rule, but that needs a little bit of work
 # to do the right thing within all.cross.
-C++ c++: cc1plus
+C++ c++: cc1plus$(exeext)
 
 # Tell GNU make to ignore these if they exist.
 .PHONY: C++ c++
@@ -124,9 +124,9 @@ CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
  $(srcdir)/cp/parse.y $(srcdir)/cp/sig.c $(srcdir)/cp/typeck2.c \
  $(srcdir)/cp/repo.c $(srcdir)/cp/semantics.c
 
-cc1plus: $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o c-pragma.o \
+cc1plus$(exeext): $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o c-pragma.o \
 	$(srcdir)/cp/cp-tree.h $(srcdir)/cp/cp-tree.def
-	cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus
+	cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus$(exeext)
 #
 # Build hooks:
 
@@ -139,40 +139,40 @@ c++.info:
 c++.dvi:
 
 # C++ language-support library pieces for libgcc.
-tinfo.o: cc1plus $(srcdir)/cp/tinfo.cc
+tinfo.o: cc1plus$(exeext) $(srcdir)/cp/tinfo.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/tinfo.cc
-tinfo2.o: cc1plus $(srcdir)/cp/tinfo2.cc
+tinfo2.o: cc1plus$(exeext) $(srcdir)/cp/tinfo2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/tinfo2.cc
-exception.o: cc1plus $(srcdir)/cp/exception.cc
+exception.o: cc1plus$(exeext) $(srcdir)/cp/exception.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c -fexceptions $(srcdir)/cp/exception.cc
-new.o: cc1plus $(srcdir)/cp/new.cc
+new.o: cc1plus$(exeext) $(srcdir)/cp/new.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new.cc
-opnew.o: cc1plus $(srcdir)/cp/new1.cc
+opnew.o: cc1plus$(exeext) $(srcdir)/cp/new1.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new1.cc -DL_op_new -o opnew.o
-opnewnt.o: cc1plus $(srcdir)/cp/new1.cc
+opnewnt.o: cc1plus$(exeext) $(srcdir)/cp/new1.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new1.cc -DL_op_newnt -o opnewnt.o
-opvnew.o: cc1plus $(srcdir)/cp/new2.cc
+opvnew.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_vnew -o opvnew.o
-opvnewnt.o: cc1plus $(srcdir)/cp/new2.cc
+opvnewnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_vnewnt -o opvnewnt.o
-opdel.o: cc1plus $(srcdir)/cp/new2.cc
+opdel.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_delete -o opdel.o
-opdelnt.o: cc1plus $(srcdir)/cp/new2.cc
+opdelnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_delnt -o opdelnt.o
-opvdel.o: cc1plus $(srcdir)/cp/new2.cc
+opvdel.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_vdel -o opvdel.o
-opvdelnt.o: cc1plus $(srcdir)/cp/new2.cc
+opvdelnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
 	  -c $(srcdir)/cp/new2.cc -DL_op_vdelnt -o opvdelnt.o
 
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index f677dfe..77e8196 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -125,7 +125,7 @@ all: all.indirect
 #
 # Now figure out from those variables how to compile and link.
 
-all.indirect: Makefile ../cc1plus
+all.indirect: Makefile ../cc1plus$(exeext)
 
 # IN_GCC tells obstack.h that we are using gcc's <stddef.h> file.
 INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@
@@ -172,15 +172,15 @@ CXX_OBJS = call.o decl.o errfn.o expr.o pt.o sig.o typeck2.o \
 OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o
 OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o
 
-compiler: ../cc1plus
-../cc1plus: $(P) $(CXX_OBJS) $(OBJDEPS) $(LIBDEPS)
+compiler: ../cc1plus$(exeext)
+../cc1plus$(exeext): $(P) $(CXX_OBJS) $(OBJDEPS) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
 	      $(CXX_OBJS) $(OBJS) $(LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure
 	cd ..; $(SHELL) config.status
 
-native: config.status ../cc1plus
+native: config.status ../cc1plus$(exeext)
 #
 # Compiling object files from source files.
 
@@ -202,7 +202,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
   `echo $(PARSE_C) | sed 's,^\./,,'`
 
-CONFLICTS = expect 19 shift/reduce conflicts and 39 reduce/reduce conflicts.
+CONFLICTS = expect 21 shift/reduce conflicts and 49 reduce/reduce conflicts.
 $(PARSE_H) : $(PARSE_C)
 $(PARSE_C) : $(srcdir)/parse.y
 	@echo $(CONFLICTS)