diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1e07758b00d2..4ae7b594275c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1998-10-29 Richard Henderson + + * Makefile.in (cc1plus): Put CXX_OBJS, and thence @extra_cxx_objs@, + last. + 1998-10-28 Jason Merrill * class.c (instantiate_type): Don't consider templates for a normal diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 425bedd3dd22..9999f117b10a 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -188,9 +188,8 @@ OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o compiler: ../cc1plus$(exeext) -../cc1plus$(exeext): $(P) $(CXX_OBJS) $(OBJDEPS) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(CXX_OBJS) $(OBJS) $(LIBS) +../cc1plus$(exeext): $(P) $(OBJDEPS) $(CXX_OBJS) $(LIBDEPS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(CXX_OBJS) $(LIBS) Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure cd ..; $(SHELL) config.status