From: Nick Clifton Date: Sat, 21 Mar 1998 23:49:35 +0000 (+0000) Subject: Makefile.in: Various fixes for building cygwin32 native toolchains. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a73cab0f26f6a1c6ebf8b27f106223690e75ef3c;p=gcc.git 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 From-SVN: r18745 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dd33cd6fa18..b3fe9fc9935 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 22 00:50:42 1998 Nick Clifton + Geoff Noer + + * Makefile.in: Various fixes for building cygwin32 native toolchains. + * Make-lang.in: Likewise. + Fri Mar 20 18:07:39 1998 Kriang Lerdsuwanakij * pt.c (tsubst, TEMPLATE_TEMPLATE_PARM): Simplify. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 67fca2e315c..6490c7e1d66 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 f677dfe7b1e..77e81960e2c 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 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) diff --git a/gcc/f/ChangeLog.egcs b/gcc/f/ChangeLog.egcs index 70b2e371460..f39a6f7fef9 100644 --- a/gcc/f/ChangeLog.egcs +++ b/gcc/f/ChangeLog.egcs @@ -1,3 +1,9 @@ +Sun Mar 22 00:50:42 1998 Nick Clifton + Geoff Noer + + * Makefile.in: Various fixes for building cygwin32 native toolchains. + * Make-lang.in: Likewise. + Thu Mar 12 09:39:40 1998 Manfred Hollstein * lang-specs.h: Properly put brackets around array elements in initializer. diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index b0e081e99b6..2c2faadc3f0 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -87,7 +87,7 @@ G77_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g77 | sed $$t` # Note that it would be nice to move the dependency on g77 # into the F77 rule, but that needs a little bit of work # to do the right thing within all.cross. -F77 f77: f771 +F77 f77: f771$(exeext) # Tell GNU make to ignore these if they exist. .PHONY: F77 f77 f77.all.build f77.all.cross \ @@ -228,8 +228,8 @@ F77_SRCS = \ $(srcdir)/f/where.c \ $(srcdir)/f/where.h -f771: $(P) $(F77_SRCS) $(LIBDEPS) stamp-objlist f/Makefile - $(MAKE) -f f/Makefile $(FLAGS_TO_PASS) VPATH=$(srcdir) srcdir=$(srcdir) f771 +f771:$(exeext) $(P) $(F77_SRCS) $(LIBDEPS) stamp-objlist f/Makefile + $(MAKE) -f f/Makefile $(FLAGS_TO_PASS) VPATH=$(srcdir) srcdir=$(srcdir) f771$(exeext) f/Makefile: $(srcdir)/f/Makefile.in $(srcdir)/configure $(SHELL) config.status diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in index 6fb7cedafb9..4d502cb72bd 100644 --- a/gcc/f/Makefile.in +++ b/gcc/f/Makefile.in @@ -139,7 +139,7 @@ all: all.indirect # # Now figure out from those variables how to compile and link. -all.indirect: f/Makefile f771 +all.indirect: f/Makefile f771$(exeext) # IN_GCC tells obstack.h that we are using gcc's file. INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @@ -253,9 +253,9 @@ F77_OBJS = \ OBJS = `cat stamp-objlist | sed -e "s: : :g" -e "s: : f/:g"` OBJDEPS = stamp-objlist -compiler: f771 +compiler: f771$(exeext) # This is now meant to be built in the top level directory, not `f': -f771: $(P) f/Makefile $(F77_OBJS) $(OBJDEPS) $(LIBDEPS) +f771$(exeext): $(P) f/Makefile $(F77_OBJS) $(OBJDEPS) $(LIBDEPS) rm -f f771$(exeext) $(CC) $(ALL_CFLAGS) $(LDFLAGS) $(F771_LDFLAGS) -o $@ \ $(F77_OBJS) $(OBJS) $(LIBS) @@ -268,7 +268,7 @@ f/Makefile: Makefile: $(srcdir)/f/Makefile.in $(srcdir)/configure -native: f771 +native: f771$(exeext) # # Compiling object files from source files.