diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-06-27 20:40:05 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-06-27 20:40:05 +0000 |
| commit | 49199692ee34568dfc52aa22b5a472148bdc0880 (patch) | |
| tree | 92f8453d235ebff19442cfec82d9943ac8c9bda2 | |
| parent | d51681a7b8cad87c9c1d23593ff4c3bd4f096117 (diff) | |
| download | gcc-49199692ee34568dfc52aa22b5a472148bdc0880.zip gcc-49199692ee34568dfc52aa22b5a472148bdc0880.tar.gz gcc-49199692ee34568dfc52aa22b5a472148bdc0880.tar.bz2 | |
* lib/g++.exp (g++_include_flags): Tweak.
From-SVN: r34741
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aedd567..91b90d8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2000-06-27 Mark Mitchell <mark@codesourcery.com> + + * lib/g++.exp (g++_include_flags): Tweak. + 2000-06-27 H.J. Lu <hjl@gnu.org> Loren J. Rittle <ljrittle@acm.org> diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 47ce373..e6fe950 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -85,18 +85,12 @@ proc g++_include_flags { args } { set sdir_v2 [lookfor_file ${srcdir} libstdc++] if { ${odir_v2} != "" } { append flags "-I${sdir_v2} -I${sdir_v2}/stl " - } - set odir_v3 [lookfor_file ${gccpath} libstdc++-v3] - set sdir_v3 [lookfor_file ${srcdir} libstdc++-v3] - if { ${odir_v3} != "" } { + } 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_v2} != "" && ${odir_v3} != ""} { - send_error "ERROR: can't handle both libstdc++ and libstdc++-v3 appearing in build tree.\n" - exit 1 - } - return "$flags" } |