* gcc.dg/cilk-plus/cilk-plus.exp: Fix last change.
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
index cb27418..2f7fcb7 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
+++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
@@ -22,8 +22,7 @@ if { ![check_effective_target_cilkplus] } {
return;
}
-verbose "$tool $libdir" 1
-set library_var "[get_multilibs]"
+set library_var [get_multilibs]
# Pointing the ld_library_path to the Cilk Runtime library binaries.
append ld_library_path ":${library_var}/libcilkrts/.libs"
set_ld_library_path_env_vars
@@ -38,14 +37,6 @@ g++-dg-runtest [lsort [glob -nocomplain
$srcdir/c-c++-common/cilk-plus/PS/*.c]]
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] ""
dg-finish
-set library_var [get_multilibs]
-# Pointing the ld_library_path to the Cilk Runtime library binaries.
-append ld_library_path ":${library_var}/libcilkrts/.libs"
-set_ld_library_path_env_vars
-
-global TEST_EXTRA_LIBS
-set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs"
-
dg-init
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] "
-fcilkplus" " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] "
-O1 -fcilkplus" " "
--
1.8.5.1
--
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
