Commit 604b5bcb by Arnaud Charlet

* Makefile.in

	(common-tools): New rule, to avoid parallel build failure on gnat tools.
	Reenable parallel builds on this Makefile.

	* Make-lang.in: Update dependencies.

From-SVN: r135631
parent 36cee502
...@@ -56,10 +56,6 @@ ...@@ -56,10 +56,6 @@
# FLEX: Gnu flex works. # FLEX: Gnu flex works.
# Other miscellaneous tools for obscure targets. # Other miscellaneous tools for obscure targets.
# Tell GNU make 3.79 not to run this directory in parallel.
# Not all of the required dependencies are present.
.NOTPARALLEL:
# Suppress smart makes who think they know how to automake Yacc files # Suppress smart makes who think they know how to automake Yacc files
.y.c: .y.c:
...@@ -1780,55 +1776,29 @@ ifeq ($(TOOLSCASE),cross) ...@@ -1780,55 +1776,29 @@ ifeq ($(TOOLSCASE),cross)
vpath %.h ../ vpath %.h ../
endif endif
../../gnatchop$(exeext): common-tools:
$(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATMAKE) -c -b $(ADA_INCLUDES) \
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop --GNATBIND="$(GNATBIND)" --GCC="$(CC) $(ALL_ADAFLAGS)" \
$(GNATLINK) -v gnatchop -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
../../gnat$(exeext): $(GNATLINK) -v gnatcmd -o ../../gnat$(exext) \
$(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd --GCC="$(CC) $(ALL_ADAFLAGS)" --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatcmd $(GNATLINK) -v gnatchop -o ../../gnatchop$(exext) \
$(GNATLINK) -v gnatcmd -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATLINK) -v gnatkr -o ../../gnatkr$(exext) \
../../gnatkr$(exeext): --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATMAKE) -c $(ADA_INCLUDES) gnatkr --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATLINK) -v gnatls -o ../../gnatls$(exext) \
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatkr --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATLINK) -v gnatkr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatprep -o ../../gnatprep$(exext) \
--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatls$(exeext): $(GNATLINK) -v gnatxref -o ../../gnatxref$(exext) \
$(GNATMAKE) -c $(ADA_INCLUDES) gnatls --GCC="$(CC) $(ALL_ADAFLAGS)" --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatls $(GNATLINK) -v gnatfind -o ../../gnatfind$(exext) \
$(GNATLINK) -v gnatls -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATLINK) -v gnatname -o ../../gnatname$(exext) \
../../gnatname$(exeext): --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATMAKE) -c $(ADA_INCLUDES) gnatname --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATLINK) -v gnatclean -o ../../gnatclean$(exext) \
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatname --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
$(GNATLINK) -v gnatname -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gprmake$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake
$(GNATLINK) -v gprmake -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatprep$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatprep --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatprep
$(GNATLINK) -v gnatprep -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatxref$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatxref --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatxref
$(GNATLINK) -v gnatxref -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatfind$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatfind --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatfind
$(GNATLINK) -v gnatfind -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatclean$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatclean --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatclean
$(GNATLINK) -v gnatclean -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../gnatsym$(exeext): ../../gnatsym$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
...@@ -1837,7 +1807,7 @@ endif ...@@ -1837,7 +1807,7 @@ endif
../../gnatdll$(exeext): ../../gnatdll$(exeext):
$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATBIND_FLAGS) gnatdll $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatdll
$(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
../../vxaddr2line$(exeext): targext.o ../../vxaddr2line$(exeext): targext.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment