diff options
Diffstat (limited to 'libcilkrts')
| -rw-r--r-- | libcilkrts/ChangeLog | 7 | ||||
| -rw-r--r-- | libcilkrts/Makefile.am | 3 | ||||
| -rw-r--r-- | libcilkrts/Makefile.in | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 74f592b9fc5..5ac0e4863db 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -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. diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am index d2520870a7e..f2d13aabd88 100644 --- a/libcilkrts/Makefile.am +++ b/libcilkrts/Makefile.am @@ -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 \ diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index 94902e1336e..092e2f706ec 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -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 \ |