From: Nicolas Roche <roche@adacore.com>
Date: Fri, 20 Oct 2017 09:29:35 +0000 (+0000)
Subject: configure.ac (ACX_PROG_GNAT): Append "libgnat" to the include dir.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8679fd52cf8a841c2a50d590cdc40fc0f9a434d;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42d98733299..d0ca16c2820 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 13f97cd3663..aa5937df84c 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 82711389281..d905d0d980a 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++)