aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-12-18 15:50:40 +0000
committerNick Clifton <nickc@gcc.gnu.org>2002-12-18 15:50:40 +0000
commita15791b0c9f8ab51d4eee5cceff376f77b01e4e4 (patch)
tree307be062ddaef44b6fee7181735787536b46069e
parente220f0a4555861af3c18c02522b4cff825691e55 (diff)
downloadgcc-a15791b0c9f8ab51d4eee5cceff376f77b01e4e4.zip
gcc-a15791b0c9f8ab51d4eee5cceff376f77b01e4e4.tar.gz
gcc-a15791b0c9f8ab51d4eee5cceff376f77b01e4e4.tar.bz2
Only invoke testsuite_flags if the libstdc++-v3 directory has been found.
From-SVN: r60252
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/g++.exp4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8db8e73..e4b303c7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-18 Nick Clifton <nickc@redhat.com>
+
+ * lib/g++.exp (g++_include_flags): Only invoke testsuite_flags if
+ the libstdc++-v3 directory has been found.
+
2002-12-12 Devang Patel <dpatel@apple.com>
* gcc.dg/darwin-ld-1.c: New test.
* gcc.dg/darwin-ld-2.c: New test.
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 749e1f1..ac7b3f9 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -90,7 +90,9 @@ proc g++_include_flags { paths } {
if { ${HAVE_LIBSTDCXX_V3} } {
set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
- append flags [exec sh ${odir_v3}/testsuite_flags --build-includes]
+ if { ${odir_v3} != "" } {
+ append flags [exec sh ${odir_v3}/testsuite_flags --build-includes]
+ }
} else {
set odir_v2 [lookfor_file ${gccpath} libstdc++]
set sdir_v2 [lookfor_file ${srcdir} libstdc++]