From b7b209843654bb240589251c90c3465a84d704da Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 31 Oct 2014 16:49:14 +0100 Subject: [PATCH] libgomp C++ testsuite: Don't compute 'blddir' twice It has already been set in 'libgomp/testsuite/lib/libgomp.exp:libgomp_init'. libgomp/ * testsuite/libgomp.c++/c++.exp (blddir): Don't set. * testsuite/libgomp.oacc-c++/c++.exp (blddir): Likewise. --- libgomp/testsuite/libgomp.c++/c++.exp | 3 --- libgomp/testsuite/libgomp.oacc-c++/c++.exp | 3 --- 2 files changed, 6 deletions(-) diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index 5b9a5924ff37..81c188e297a8 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -27,9 +27,6 @@ lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST" set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++" -set blddir [lookfor_file [get_multilibs] libgomp] - - if { $blddir != "" } { # Look for a static libstdc++ first. if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] { diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index 0b235ba47f35..09001788bb42 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -33,9 +33,6 @@ lappend ALWAYS_CFLAGS "additional_flags=-fopenacc" set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST" set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++" -set blddir [lookfor_file [get_multilibs] libgomp] - - if { $blddir != "" } { # Look for a static libstdc++ first. if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] { -- 2.39.2