diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-10-30 20:51:17 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-10-30 20:51:17 +0100 |
| commit | fc7f44e4c4be38a8c7832fff204cd0f4a61aad6b (patch) | |
| tree | 62d262077e18f00cbaa2c638fb1acc026047d7dd /gcc | |
| parent | 04056396ec8747e8372364793a0c2a4ea794477d (diff) | |
| download | gcc-fc7f44e4c4be38a8c7832fff204cd0f4a61aad6b.zip gcc-fc7f44e4c4be38a8c7832fff204cd0f4a61aad6b.tar.gz gcc-fc7f44e4c4be38a8c7832fff204cd0f4a61aad6b.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 748ab12..690c6fc 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 a8f00d4..0a9d19b 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" " " |