diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8db8e7385cc..e4b303c79c5 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 749e1f1c2cd..ac7b3f94192 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++]