Hello Everyone,
The following patch will fix the bug in PR 59094. The main issue was
that version specific libraries are not stored in the correct location. The
patch below should fix that. It is committed since the person who filed the bug
has confirmed that the fix works.
Index: libcilkrts/Makefile.in
===================================================================
--- libcilkrts/Makefile.in (revision 206468)
+++ 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/ChangeLog
===================================================================
--- libcilkrts/ChangeLog (revision 206468)
+++ libcilkrts/ChangeLog (working copy)
@@ -1,3 +1,10 @@
+2014-01-09 Balaji V. Iyer <[email protected]>
+
+ bootstrap/59094
+ * Makefile.am (cilkincludedir): Fixed a bug to store version-specific
+ runtime libraries in the correct place.
+ * Makefile.in: Regenerate.
+
2013-12-13 Balaji V. Iyer <[email protected]>
* Makefile.am (GENERAL_FLAGS): Removed undefining of Cilk keywords.
Index: libcilkrts/Makefile.am
===================================================================
--- libcilkrts/Makefile.am (revision 206468)
+++ 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 \
Thanks,
Balaji V. Iyer.
