+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>
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"
}