Only invoke testsuite_flags if the libstdc++-v3 directory has been found.

From-SVN: r60252

Only invoke testsuite_flags if the libstdc++-v3 directory has been found.
From-SVN: r60252
a15791b0 · Nick Clifton · Nick Clifton · e220f0a4 · a15791b0 · a15791b0
Commit a15791b0 authored Dec 18, 2002 by Nick Clifton Committed by Nick Clifton Dec 18, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletions

gcc/testsuite/ChangeLog
+5 -0

gcc/testsuite/lib/g++.exp
+3 -1

No files found.
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
+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.

--- 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++]