diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-16 22:13:25 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-16 22:13:25 +0000 |
| commit | 6e97aa072973a8bb2c77d06415bf6c7ee971c836 (patch) | |
| tree | c4b3b8f0accec4ee302ddba12cef9e1a3b2e19ac /gcc | |
| parent | d0da75fa83a174f9d89bd4be323e5ab64bc44e68 (diff) | |
* aclocal.m4 (gcc_AC_PROG_GNAT): Check if ${CC} produces object
file for Ada compilation.
Fix gcc_cv_cc_supports_ada spelling.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_4-branch@80770 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/aclocal.m4 | 7 | ||||
| -rwxr-xr-x | gcc/configure | 9 |
3 files changed, 18 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 53d6f1397a2..e6053d50f7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-04-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * aclocal.m4 (gcc_AC_PROG_GNAT): Check if ${CC} produces object + file for Ada compilation. + Fix gcc_cv_cc_supports_ada spelling. + * configure: Regenerate. + 2004-04-14 Zack Weinberg <zack@codesourcery.com> PR 14936 diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 054a2bb3ec7..939fb640e45 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -316,14 +316,17 @@ gcc_cv_cc_supports_ada=no # has not been installed. This is fixed in 2.95.4, 3.0.2, and 3.1. # Therefore we must check for the error message as well as an # unsuccessful exit. +# Other compilers, like HP Tru64 UNIX cc, exit successfully when +# given a .adb file, but produce no object file. So we must check +# if an object file was really produced to guard against this. errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` -if test x"$errors" = x; then +if test x"$errors" = x && test -f conftest.$ac_objext; then gcc_cv_cc_supports_ada=yes break fi rm -f conftest.*]) -if test x$GNATBIND != xno && test x$gcc_cv_supports_ada != xno; then +if test x$GNATBIND != xno && test x$gcc_cv_cc_supports_ada != xno; then have_gnat=yes else have_gnat=no diff --git a/gcc/configure b/gcc/configure index 0393ba34df4..13cb9cd795e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -3700,8 +3700,11 @@ gcc_cv_cc_supports_ada=no # has not been installed. This is fixed in 2.95.4, 3.0.2, and 3.1. # Therefore we must check for the error message as well as an # unsuccessful exit. +# Other compilers, like HP Tru64 UNIX cc, exit successfully when +# given a .adb file, but produce no object file. So we must check +# if an object file was really produced to guard against this. errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` -if test x"$errors" = x; then +if test x"$errors" = x && test -f conftest.$ac_objext; then gcc_cv_cc_supports_ada=yes break fi @@ -3710,7 +3713,7 @@ fi echo "$as_me:$LINENO: result: $gcc_cv_cc_supports_ada" >&5 echo "${ECHO_T}$gcc_cv_cc_supports_ada" >&6 -if test x$GNATBIND != xno && test x$gcc_cv_supports_ada != xno; then +if test x$GNATBIND != xno && test x$gcc_cv_cc_supports_ada != xno; then have_gnat=yes else have_gnat=no @@ -5006,7 +5009,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:5009: version of makeinfo is $ac_prog_version" >&5 + echo "configure:5012: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) |