diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 282d8578fd0..19b42e64431 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -350,7 +350,7 @@ OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \ rtl.o print-rtl.o rtlanal.o emit-rtl.o \ dbxout.o sdbout.o dwarfout.o xcoffout.o \ integrate.o jump.o cse.o loop.o unroll.o flow.o stupid.o combine.o \ - regclass.o local-alloc.o global-alloc.o reload.o reload1.o caller-save.o \ + regclass.o local-alloc.o global.o reload.o reload1.o caller-save.o \ insn-peep.o reorg.o sched.o final.o recog.o reg-stack.o \ insn-recog.o insn-extract.o insn-output.o insn-emit.o \ insn-attrtab.o aux-output.o getpwd.o $(EXTRA_OBJS) @@ -823,7 +823,7 @@ regclass.o : regclass.c $(CONFIG_H) $(RTL_H) hard-reg-set.h flags.h \ basic-block.h regs.h insn-config.h recog.h reload.h real.h local-alloc.o : local-alloc.c $(CONFIG_H) $(RTL_H) flags.h basic-block.h \ regs.h hard-reg-set.h insn-config.h recog.h output.h -global-alloc.o : global-alloc.c $(CONFIG_H) $(RTL_H) flags.h \ +global.o : global.c $(CONFIG_H) $(RTL_H) flags.h \ basic-block.h regs.h hard-reg-set.h insn-config.h output.h reload.o : reload.c $(CONFIG_H) $(RTL_H) flags.h \ @@ -1351,7 +1351,7 @@ install-dir: -if [ -d $(mandir) ] ; then true ; else mkdir $(mandir) ; fi # Install the compiler executables built during cross compilation. -install-common: native install-dir +install-common: native install-dir xgcc $(srcdir)/g++ $(srcdir)/c++ $(EXTRA_PARTS) for file in $(COMPILERS); do \ if [ -f $$file ] ; then \ rm -f $(libsubdir)/$$file; \ @@ -1365,8 +1365,13 @@ install-common: native install-dir $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ else true; fi; \ done - -rm -f $(libsubdir)/specs - $(INSTALL_DATA) specs $(libsubdir)/specs +# Don't mess with specs if it doesn't exist yet. +# We can't make it a dependency because with a cross compiler +# you have to make specs on the target machine or not at all. + if [ -f specs ] ; then \ + -rm -f $(libsubdir)/specs; \ + $(INSTALL_DATA) specs $(libsubdir)/specs; \ + fi # Install the driver program as gcc-$(target) # and also as either gcc (if native) or $(tooldir)/bin/gcc. -if [ -f gcc-cross ] ; then \