This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: g++ testsuite
- To: gcc-patches at gcc dot gnu dot org
- Subject: PATCH: g++ testsuite
- From: Mark Mitchell <mark at codesourcery dot com>
- Date: Tue, 27 Jun 2000 13:41:31 -0700
- Organization: CodeSourcery, LLC
This patch:
2000-06-27 H.J. Lu <hjl@gnu.org>
Loren J. Rittle <ljrittle@acm.org>
* lib/g++.exp (g++_include_flags): Override libgloss.exp
version with one that knows about the new gcc tree structure.
(g++_link_flags): Same.
wasn't correct for V2 builds. This line:
! set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
sets odir_v3 to a non-empty file even when libstdc++-v3 isn't being
used because lookfor_file looks up far enough that it finds the
libstdc++-v3 in the source directory. Fixed with this patch, which
hopefully keeps V3 tests working as well.
--
Mark Mitchell mark@codesourcery.com
CodeSourcery, LLC http://www.codesourcery.com
2000-06-27 Mark Mitchell <mark@codesourcery.com>
* lib/g++.exp (g++_include_flags): Fix so that V2 trees continue
to work.
Index: lib/g++.exp
===================================================================
RCS file: /cvs/gcc/egcs/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.9
diff -c -p -r1.9 g++.exp
*** g++.exp 2000/06/27 18:01:02 1.9
--- g++.exp 2000/06/27 20:39:25
*************** proc g++_include_flags { args } {
*** 85,100 ****
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} != "" } {
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"
--- 85,94 ----
set sdir_v2 [lookfor_file ${srcdir} libstdc++]
if { ${odir_v2} != "" } {
append flags "-I${sdir_v2} -I${sdir_v2}/stl "
! } 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}]
}
return "$flags"