diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.def | 13 | ||||
| -rw-r--r-- | Makefile.in | 66 | ||||
| -rw-r--r-- | Makefile.tpl | 22 |
4 files changed, 83 insertions, 24 deletions
@@ -1,3 +1,9 @@ +2009-04-09 Steve Ellcey <sje@cup.hp.com> + + * Makefil.def (languages): New entries. + * Makefile.tpl (check-gcc-*): New generic target. + * Makefile.in: Regenerate. + 2009-03-27 Eli Zaretskii <eliz@gnu.org> * djunpack.bat: Use ".." quoting in Sed command, for the sake of diff --git a/Makefile.def b/Makefile.def index a0a5266d2..c6a929135 100644 --- a/Makefile.def +++ b/Makefile.def @@ -541,6 +541,19 @@ dependencies = { module=all-target-libgloss; on=all-target-newlib; }; dependencies = { module=all-target-winsup; on=all-target-libiberty; }; dependencies = { module=all-target-winsup; on=all-target-libtermcap; }; +languages = { language=c; gcc-check-target=check-gcc; }; +languages = { language=c++; gcc-check-target=check-c++; + lib-check-target=check-target-libstdc++-v3; }; +languages = { language=fortran; gcc-check-target=check-fortran; + lib-check-target=check-target-libgfortran; }; +languages = { language=java; gcc-check-target=check-java; + lib-check-target=check-target-libjava; }; +languages = { language=ada; gcc-check-target=check-ada; + lib-check-target=check-target-libada; }; +languages = { language=objc; gcc-check-target=check-objc; + lib-check-target=check-target-libobjc; }; +languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; + // Toplevel bootstrap bootstrap_stage = { id=1 ; diff --git a/Makefile.in b/Makefile.in index 26d1d01b5..de33e1130 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52921,19 +52921,63 @@ cross: all-build all-gas all-ld @endif gcc-no-bootstrap @if gcc -.PHONY: check-gcc-c++ + +.PHONY: check-gcc-c check-c +check-gcc-c: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-gcc); +check-c: check-gcc-c + +.PHONY: check-gcc-c++ check-c++ check-gcc-c++: - @if [ -f ./gcc/Makefile ] ; then \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ - else \ - true; \ - fi + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); +check-c++: check-gcc-c++ check-target-libstdc++-v3 + +.PHONY: check-gcc-fortran check-fortran +check-gcc-fortran: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran); +check-fortran: check-gcc-fortran check-target-libgfortran + +.PHONY: check-gcc-java check-java +check-gcc-java: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java); +check-java: check-gcc-java check-target-libjava + +.PHONY: check-gcc-ada check-ada +check-gcc-ada: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-ada); +check-ada: check-gcc-ada check-target-libada + +.PHONY: check-gcc-objc check-objc +check-gcc-objc: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-objc); +check-objc: check-gcc-objc check-target-libobjc + +.PHONY: check-gcc-obj-c++ check-obj-c++ +check-gcc-obj-c++: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-obj-c++); +check-obj-c++: check-gcc-obj-c++ -.PHONY: check-c++ -check-c++: check-target-libstdc++-v3 check-gcc-c++ # Install the gcc headers files, but not the fixed include files, # which Cygnus is not allowed to distribute. This rule is very diff --git a/Makefile.tpl b/Makefile.tpl index acb349ff7..1de3b0605 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1216,19 +1216,15 @@ cross: all-build all-gas all-ld @endif gcc-no-bootstrap @if gcc -.PHONY: check-gcc-c++ -check-gcc-c++: - @if [ -f ./gcc/Makefile ] ; then \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ - else \ - true; \ - fi - -.PHONY: check-c++ -check-c++: check-target-libstdc++-v3 check-gcc-c++ +[+ FOR languages +] +.PHONY: check-gcc-[+language+] check-[+language+] +check-gcc-[+language+]: + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) [+gcc-check-target+]); +check-[+language+]: check-gcc-[+language+][+ IF lib-check-target +] [+ lib-check-target +][+ ENDIF lib-check-target +] +[+ ENDFOR languages +] # Install the gcc headers files, but not the fixed include files, # which Cygnus is not allowed to distribute. This rule is very |