From: Tobias Burnus <burnus@net-b.de>
Date: Wed, 30 Oct 2013 19:51:17 +0000 (+0100)
Subject: cilk-plus.exp: Add the libcilkrts library path to the compile flags.
X-Git-Tag: releases/gcc-4.9.0~3134
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=fc7f44e4c4be38a8c7832fff204cd0f4a61aad6b;p=gcc.git

cilk-plus.exp: Add the libcilkrts library path to the compile flags.

2013-10-30  Tobias Burnus  <burnus@net-b.de>

        * gcc.dg/cilk-plus/cilk-plus.exp: Add the libcilkrts library
        path to the compile flags.

From-SVN: r204227
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 748ab127cba6..690c6fc29291 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Tobias Burnus  <burnus@net-b.de>
+
+	* gcc.dg/cilk-plus/cilk-plus.exp: Add the libcilkrts library
+	path to the compile flags.
+
 2013-10-30  Mikael Pettersson  <mikpe@it.uu.se>
 
 	* PR rtl-optimization/58369
diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
index a8f00d493ee9..0a9d19bf724a 100644
--- a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
+++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
@@ -26,7 +26,24 @@ if { ![check_effective_target_cilkplus] } {
 verbose "$tool $libdir" 1
 set library_var [get_multilibs]
 # Pointing the ld_library_path to the Cilk Runtime library binaries. 
-set ld_library_path "${library_var}/libcilkrts/.libs"
+if { $gccpath != "" } {
+  if { [file exists "${gccpath}/libcilkrts/.libs/libcilkrts.a"]
+       || [file exists "${gccpath}/libcilkrts/.libs/libcilkrts.${shlib_ext}"] } {
+      append flags " -B${gccpath}/libcilkrts/ "
+      append flags " -L${gccpath}/libcilkrts/.libs "
+      append ld_library_path ":${gccpath}/libcilkrts/.libs"
+  }
+} else {
+  global tool_root_dir
+
+  set libcilkrts [lookfor_file ${tool_root_dir} libcilkrts]
+  if { $libcilkrts != "" } {
+      append flags "-L${libcilkrts} "
+      append ld_library_path ":${libcilkrts}"
+  }
+}
+
+set_ld_library_path_env_vars
 
 dg-init
 dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " "