aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Roche <roche@adacore.com>2017-10-20 09:29:35 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2017-10-20 09:29:35 +0000
commite8679fd52cf8a841c2a50d590cdc40fc0f9a434d (patch)
tree0051d6bd812709382c7304df65b5a22032766086
parent356fcc67fba52b6d923ab72769247300b847478d (diff)
downloadgcc-e8679fd52cf8a841c2a50d590cdc40fc0f9a434d.zip
gcc-e8679fd52cf8a841c2a50d590cdc40fc0f9a434d.tar.gz
gcc-e8679fd52cf8a841c2a50d590cdc40fc0f9a434d.tar.bz2
configure.ac (ACX_PROG_GNAT): Append "libgnat" to the include dir.
* configure.ac (ACX_PROG_GNAT): Append "libgnat" to the include dir. * configure: Regenerate. From-SVN: r253928
-rw-r--r--gcc/ChangeLog5
-rwxr-xr-xgcc/configure2
-rw-r--r--gcc/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42d9873..d0ca16c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-20 Nicolas Roche <roche@adacore.com>
+
+ * configure.ac (ACX_PROG_GNAT): Append "libgnat" to the include dir.
+ * configure: Regenerate.
+
2017-10-20 Jakub Jelinek <jakub@redhat.com>
PR target/82158
diff --git a/gcc/configure b/gcc/configure
index 13f97cd..aa5937d 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -4987,7 +4987,7 @@ acx_cv_cc_gcc_supports_ada=no
# 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} -I"$srcdir"/ada -c conftest.adb) 2>&1 || echo failure`
+errors=`(${CC} -I"$srcdir"/ada/libgnat -c conftest.adb) 2>&1 || echo failure`
if test x"$errors" = x && test -f conftest.$ac_objext; then
acx_cv_cc_gcc_supports_ada=yes
fi
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 8271138..d905d0d 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -362,7 +362,7 @@ rm -f a.out a.exe b.out
# Find the native compiler
AC_PROG_CC
AC_PROG_CXX
-ACX_PROG_GNAT([-I"$srcdir"/ada])
+ACX_PROG_GNAT([-I"$srcdir"/ada/libgnat])
# Do configure tests with the C++ compiler, since that's what we build with.
AC_LANG(C++)