Index: doc/user.sgml =================================================================== RCS file: /cvs/src/src/dejagnu/doc/user.sgml,v retrieving revision 1.2 diff -p -c -u -p -r1.2 user.sgml --- doc/user.sgml 21 Apr 2002 08:47:03 -0000 1.2 +++ doc/user.sgml 27 Oct 2002 02:35:40 -0000 @@ -879,7 +879,7 @@ set target_triplet i586-pc-linux-gnulibc1 set target_alias i586-pc-linux-gnulibc1 set CFLAGS "" - set CXXFLAGS "-I/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libio -I$srcdir/../libg++/src -I$srcdir/../libio -I$srcdir/../libstdc++ -I$srcdir/../libstdc++/stl -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libg++ -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libstdc++" + set CXXFLAGS "-isystem /build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libio -isystem $srcdir/../libg++/src -isystem $srcdir/../libio -isystem $srcdir/../libstdc++ -isystem $srcdir/../libstdc++/stl -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libg++ -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libstdc++" append LDFLAGS " -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../ld" set tmpdir /build/devo-builds/i586-pc-linux-gnulibc1/gcc/testsuite set srcdir "${srcdir}/testsuite" Index: lib/libgloss.exp =================================================================== RCS file: /cvs/src/src/dejagnu/lib/libgloss.exp,v retrieving revision 1.9 diff -p -c -u -p -r1.9 libgloss.exp --- lib/libgloss.exp 26 Sep 2002 09:50:03 -0000 1.9 +++ lib/libgloss.exp 27 Oct 2002 02:35:40 -0000 @@ -159,7 +159,7 @@ proc newlib_include_flags { args } { if { ${newlib_dir} != "" } { set newlib_dir [file dirname ${newlib_dir}] } - return " -I$gccpath/newlib/targ-include -I${newlib_dir}" + return " -isystem $gccpath/newlib/targ-include -isystem ${newlib_dir}" } else { verbose "No newlib support for this target" } @@ -191,7 +191,7 @@ proc libio_include_flags { args } { if { $libio_bin_dir != "" && $libio_src_dir != "" } { set libio_src_dir [file dirname ${libio_src_dir}] set libio_bin_dir [file dirname ${libio_bin_dir}]; - return " -I${libio_src_dir} -I${libio_bin_dir}" + return " -isystem ${libio_src_dir} -isystem ${libio_bin_dir}" } else { return "" } @@ -226,22 +226,23 @@ proc g++_include_flags { args } { set dir [lookfor_file ${srcdir} libg++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/src" + append flags " -isystem ${dir} -isystem ${dir}/src" } set dir [lookfor_file ${srcdir} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++" + append flags " -isystem ${dir}/include -isystem ${dir}/include/std" + append flags " -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++" } set dir [lookfor_file ${gccpath} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/${target_alias}" + append flags " -isystem ${dir}/include -isystem ${dir}/include/${target_alias}" } set dir [lookfor_file ${srcdir} libstdc++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/stl" + append flags " -isystem ${dir} -isystem ${dir}/stl" } return "$flags" @@ -317,19 +318,20 @@ proc libstdc++_include_flags { args } { set dir [lookfor_file ${srcdir} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++" + append flags " -isystem ${dir}/include -isystem ${dir}/include/std" + append flags " -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++" } set gccpath [get_multilibs] set dir [lookfor_file ${gccpath} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/${target_alias}" + append flags " -isystem ${dir}/include -isystem ${dir}/include/${target_alias}" } set dir [lookfor_file ${srcdir} libstdc++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/stl" + append flags " -isystem ${dir} -isystem ${dir}/stl" } return "$flags" @@ -860,7 +862,7 @@ proc winsup_include_flags { args } { set winsup_dir [lookfor_file ${srcdir} winsup/include/windows.h] if { ${winsup_dir} != "" } { set winsup_dir [file dirname ${winsup_dir}] - return " -I${winsup_dir}" + return " -isystem ${winsup_dir}" } } verbose "No winsup support for this target"