diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-23 16:37:09 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-23 16:37:09 +0000 |
| commit | a18b2c54f3d38eaabb5bcdee26d887bb389ddc96 (patch) | |
| tree | 5f70719b7af7ee93a93c643d7f80db9037b57ff2 /config | |
| parent | cfcda0e005c8e2709b43f40e915e032b7a16e2d6 (diff) | |
| download | gcc-a18b2c54f3d38eaabb5bcdee26d887bb389ddc96.tar.gz | |
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Makefile.def (flags_to_pass): Add GNATBIND and GNATMAKE.
* Makefile.tpl (GNATBIND): Substitute it.
(GNATMAKE): Likewise.
(POSTSTAGE1_FLAGS_TO_PASS): Pass staged GNATBIND instead
of STAGE_PREFIX.
* Makefile.in: Regenerate.
* configure: Regenerate.
config/
* acx.m4 (ACX_PROG_GNAT): Check for gnatmake.
libada/
* Makefile.in (STAGE_PREFIX): Do not define.
(FLAGS_TO_PASS): Do not pass STAGE_PREFIX.
gnattools/
* Makefile.in (STAGE_PREFIX): Do not define.
ada/
* Make-lang.in: Replace invocations of gnatmake with $(GNATMAKE).
(gnatboot2): Pass staged GNATMAKE instead of STAGE_PREFIX.
(gnatboot3): Likewise.
(GNATBIND): Do not define.
* Makefile.in (GNATBIND): Do not define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/acx.m4 | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index bf596163c93..91dc5e2a26c 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2007-01-23 Richard Guenther <rguenther@suse.de> + + PR bootstrap/30541 + * config/acx.m4 (ACX_PROG_GNAT): Check for gnatmake. + 2007-01-14 H.J. Lu <hongjiu.lu@intel.com> * ld-symbolic.m4: New. diff --git a/config/acx.m4 b/config/acx.m4 index 826f6ba3ccc..c2cf0e874dd 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -330,11 +330,12 @@ ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR # understands Ada. We use the user's CC setting, already found. # # Sets the shell variable have_gnat to yes or no as appropriate, and -# substitutes GNATBIND. +# substitutes GNATBIND and GNATMAKE. AC_DEFUN([ACX_PROG_GNAT], [AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) AC_REQUIRE([AC_PROG_CC]) AC_CHECK_TOOL(GNATBIND, gnatbind, no) +AC_CHECK_TOOL(GNATMAKE, gnatmake, no) AC_CACHE_CHECK([whether compiler driver understands Ada], acx_cv_cc_gcc_supports_ada, [cat >conftest.adb <<EOF @@ -355,7 +356,7 @@ if test x"$errors" = x && test -f conftest.$ac_objext; then fi rm -f conftest.*]) -if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then +if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then have_gnat=yes else have_gnat=no |