[Bug bootstrap/59094] New: [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[Bug bootstrap/59094] New: [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[d.g.gorbachev at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

            Bug ID: 59094
           Summary: [4.9 Regression] Cilk runtime library headers are
                    installed into the general include directory
           Product: gcc
           Version: 4.9.0
            Status: UNCONFIRMED
          Severity: minor
          Priority: P3
         Component: bootstrap
          Assignee: unassigned at gcc dot gnu.org
          Reporter: d.g.gorbachev at gmail dot com

When GCC is configured with "--enable-version-specific-runtime-libs", header
files for libstdc++, libgomp, libquadmath, etc. are installed in the
compiler-specific directory ($libdir/gcc/$target/$version/include). But
libcilkrts, somehow, stands out from this scheme. It seems to be a bug.

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[d.g.gorbachev at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

Dmitry Gorbachev <d.g.gorbachev at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bviyer at gcc dot gnu.org,
                   |                            |bviyer at gmail dot com

--- Comment #1 from Dmitry Gorbachev <d.g.gorbachev at gmail dot com> ---
CC'ing the Cilk runtime library maintainer.

This is like the libvtv bug 58441...

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[bviyer at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

--- Comment #2 from Balaji V. Iyer <bviyer at gmail dot com> ---
Hi Dmitry,
    Can you please confirm if the following patch works for you?

Thanks,

Balaji V. Iyer.

===================================================================
--- libcilkrts/Makefile.in      (revision 204770)
+++ libcilkrts/Makefile.in      (working copy)
@@ -401,7 +401,8 @@
        -no-undefined

 # C/C++ header files for Cilk.
-cilkincludedir = $(includedir)/cilk
+# cilkincludedir = $(includedir)/cilk
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
 cilkinclude_HEADERS = \
   include/cilk/cilk_api.h          \
   include/cilk/cilk_api_linux.h    \
Index: libcilkrts/Makefile.am
===================================================================
--- libcilkrts/Makefile.am      (revision 204770)
+++ libcilkrts/Makefile.am      (working copy)
@@ -108,7 +108,8 @@
 libcilkrts_la_LDFLAGS += -no-undefined

 # C/C++ header files for Cilk.
-cilkincludedir = $(includedir)/cilk
+# cilkincludedir = $(includedir)/cilk
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
 cilkinclude_HEADERS =              \
   include/cilk/cilk_api.h          \
   include/cilk/cilk_api_linux.h    \



On Tue, Nov 12, 2013 at 4:58 PM, d.g.gorbachev at gmail dot com <
gcc-bugzilla@gcc.gnu.org> wrote:

> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094
>
> Dmitry Gorbachev <d.g.gorbachev at gmail dot com> changed:
>
>            What    |Removed                     |Added
>
> ----------------------------------------------------------------------------
>                  CC|                            |bviyer at gcc dot gnu.org
> ,
>                    |                            |bviyer at gmail dot com
>
> --- Comment #1 from Dmitry Gorbachev <d.g.gorbachev at gmail dot com> ---
> CC'ing the Cilk runtime library maintainer.
>
> This is like the libvtv bug 58441...
>
> --
> You are receiving this mail because:
> You are on the CC list for the bug.
>

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Priority|P3                          |P1
   Target Milestone|---                         |4.9.0

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[d.g.gorbachev at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

--- Comment #3 from Dmitry Gorbachev <d.g.gorbachev at gmail dot com> ---
(In reply to Balaji V. Iyer from comment #2)

> Can you please confirm if the following patch works for you?

Yes, the patch works.

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[bviyer at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

--- Comment #4 from bviyer at gcc dot gnu.org ---
Author: bviyer
Date: Thu Jan  9 16:52:23 2014
New Revision: 206469

URL: http://gcc.gnu.org/viewcvs?rev=206469&root=gcc&view=rev
Log:
Fix for PR bootstrap/59094
+2014-01-09  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       PR bootstrap/59094
+       * Makefile.am (cilkincludedir): Fixed a bug to store version-specific
+       runtime libraries in the correct place.
+       * Makefile.in: Regenerate.
+


Modified:
    trunk/libcilkrts/ChangeLog
    trunk/libcilkrts/Makefile.am
    trunk/libcilkrts/Makefile.in

[Bug bootstrap/59094] [4.9 Regression] Cilk runtime library headers are installed into the general include directory

[law at redhat dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59094

Jeffrey A. Law <law at redhat dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
                 CC|                            |law at redhat dot com
         Resolution|---                         |FIXED

--- Comment #5 from Jeffrey A. Law <law at redhat dot com> ---
Fixed by recent commit on trunk.