[PATCH] Remove bogus include path with in-tree cloog

[PATCH] Remove bogus include path with in-tree cloog

[Bernd Edlinger]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

Hi,

I have noticed there is a minor flaw with the include path when cloog is installed in-tree.

That is, the cloog-include directory is added twice, first with absolute path, and then
again with relative path, but with one "../" to little, so this is useless when compiling
sources in the gcc directory.

For example, if I call ../gcc-4.10-20140608/configure, the following is added to each
invocation of xg++:
-I/<absolute_path>/gcc-4.10-20140608/cloog/include -I../gcc-4.10-20140608/cloog/include
The attached patch removes the bogus relative include path for in-tree cloog/include.

Boot-strapped and regression-tested on x86_64-linux-gnu.
OK for trunk?


Thanks
Bernd.
 		 	   		  

[-- Attachment #2: changelog-cloog.txt --]
[-- Type: text/plain, Size: 186 bytes --]

2014-06-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	Fix include path for in-tree cloog.
	* config/cloog.m4 (CLOOG_INIT_FLAGS): Remove bogus include path.
	* configure: Regenerate.

[-- Attachment #3: patch-cloog.diff --]
[-- Type: application/octet-stream, Size: 1370 bytes --]

Index: config/cloog.m4
===================================================================
--- config/cloog.m4	(revision 211341)
+++ config/cloog.m4	(working copy)
@@ -63,7 +63,7 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
   if test "x${clooginc}" = x && test "x${clooglibs}" = x \
      && test -d ${srcdir}/cloog; then
      clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
-     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
+     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include'
     ENABLE_CLOOG_CHECK=no
     AC_MSG_WARN([using in-tree CLooG, disabling version check])
   fi
Index: configure
===================================================================
--- configure	(revision 211341)
+++ configure	(working copy)
@@ -6099,7 +6099,7 @@ fi
         if test "x${clooginc}" = x && test "x${clooglibs}" = x \
      && test -d ${srcdir}/cloog; then
      clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
-     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
+     clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include'
     ENABLE_CLOOG_CHECK=no
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
 $as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}

Re: [PATCH] Remove bogus include path with in-tree cloog

[Richard Biener]

On Fri, Jun 20, 2014 at 6:52 PM, Bernd Edlinger
<bernd.edlinger@hotmail.de> wrote:
> Hi,
>
> I have noticed there is a minor flaw with the include path when cloog is installed in-tree.
>
> That is, the cloog-include directory is added twice, first with absolute path, and then
> again with relative path, but with one "../" to little, so this is useless when compiling
> sources in the gcc directory.
>
> For example, if I call ../gcc-4.10-20140608/configure, the following is added to each
> invocation of xg++:
> -I/<absolute_path>/gcc-4.10-20140608/cloog/include -I../gcc-4.10-20140608/cloog/include
> The attached patch removes the bogus relative include path for in-tree cloog/include.
>
> Boot-strapped and regression-tested on x86_64-linux-gnu.
> OK for trunk?

Ok.

Thanks,
Richard.

>
> Thanks
> Bernd.
>