From 9953d23bb4545e3bce1edb09813372415f88591a Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Wed, 30 Aug 2000 18:46:56 +0000
Subject: [PATCH] * lib/g++.exp: Support testing already-installed GCC.

From-SVN: r36063
---
 gcc/testsuite/ChangeLog   | 4 ++++
 gcc/testsuite/lib/g++.exp | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f5dedbea46..7a7ceed851a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* lib/g++.exp: Support testing already-installed GCC.
+
 2000-08-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* wtr-label-1.c, wtr-suffix-1.c: New tests.
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index e6fe950393a..fde457782a5 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -88,7 +88,10 @@ proc g++_include_flags { args } {
     } else {
       set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
       set sdir_v3 [lookfor_file ${srcdir} libstdc++-v3]
-      append flags [exec ${odir_v3}/mkcheck 2 ${odir_v3} ${sdir_v3}]
+      if { ${odir_v3} != "" } {
+        append flags [exec ${odir_v3}/mkcheck 2 ${odir_v3} ${sdir_v3}]
+      }
+      # else we're probably testing an already-installed GCC.
     }
 
     return "$flags"
-- 
2.30.2