Fix for PR bootstrap/59094 +2014-01-09 Balaji V.

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

From-SVN: r206469
This commit is contained in:
Balaji V. Iyer 2014-01-09 16:52:23 +00:00 committed by Balaji V. Iyer
parent bfd3806a65
commit c7b0a171d0
3 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2014-01-09 Balaji V. Iyer <balaji.v.iyer@intel.com>
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 <balaji.v.iyer@intel.com>
* Makefile.am (GENERAL_FLAGS): Removed undefining of Cilk keywords.

View File

@ -108,7 +108,8 @@ endif
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 \

View File

@ -401,7 +401,8 @@ libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread \
-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 \