diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-06-18 01:56:45 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-06-18 01:56:45 +0000 |
| commit | 7dfa28ba07d48651b6778f06961dd6fceae2d20e (patch) | |
| tree | f0634f0c720a30184b187a86fa4439e5915a0ca0 | |
| parent | a7956a48e5cf8f6cb221256b59cbd76badcf5e37 (diff) | |
| download | gcc-7dfa28ba07d48651b6778f06961dd6fceae2d20e.zip gcc-7dfa28ba07d48651b6778f06961dd6fceae2d20e.tar.gz gcc-7dfa28ba07d48651b6778f06961dd6fceae2d20e.tar.bz2 | |
g++.exp (g++_include_flags): Tweak path to testsuite_flags.
2003-06-17 Benjamin Kosnik <bkoz@redhat.com>
* lib/g++.exp (g++_include_flags): Tweak path to testsuite_flags.
Remove cruft.
From-SVN: r68134
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 17 |
2 files changed, 8 insertions, 14 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0315ff0..0943139 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-06-17 Benjamin Kosnik <bkoz@redhat.com> + + * lib/g++.exp (g++_include_flags): Tweak path to testsuite_flags. + Remove cruft. + 2003-06-17 Kazu Hirata <kazu@cs.umass.edu> * gcc.c-torture/compile/20020604-1.c: Use dg-xfail-if for h8300. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 821c3d7..81ac484 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -80,22 +80,11 @@ proc g++_include_flags { paths } { return "${flags}" } - set dir [lookfor_file ${srcdir} libg++] - if { ${dir} != "" } { - append flags "-I${dir} -I${dir}/src " - } - set gccpath ${paths} - if { ${HAVE_LIBSTDCXX_V3} } { - set odir_v3 [lookfor_file ${gccpath} libstdc++-v3] - 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++] - append flags "-I${sdir_v2} -I${sdir_v2}/stl " + set odir [lookfor_file ${gccpath} libstdc++-v3] + if { ${odir} != "" } { + append flags [exec sh ${odir}/scripts/testsuite_flags --build-includes] } return "$flags" |