aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/user.sgml2
-rw-r--r--lib/libgloss.exp23
3 files changed, 21 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index f1ea049..da34783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2002-11-13 Matt Bemis <bemis@iol.unh.edu>
* Fixed input/output to check for empty.
+2002-11-12 Hans-Peter Nilsson <hp@bitrange.com>
+ * lib/libgloss.exp (newlib_include_flags): Use -isystem, not -I.
+ (libio_include_flags, g++_include_flags, libstdc++_include_flags,
+ winsup_include_flags): Ditto.
+ * doc/user.sgml (Local Config File): Use -isystem, not -I, in
+ example.
+
2002-11-12 Peter Breitenlohner <peb@mppmu.mpg.de>
2002-10-29 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
* Makefile.am: Add support for DESTDIR.
diff --git a/doc/user.sgml b/doc/user.sgml
index d1727c4..61e6212 100644
--- a/doc/user.sgml
+++ b/doc/user.sgml
@@ -1588,7 +1588,7 @@ powerpc-linux-gcc -g -O2 -o calc calc.o
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"
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 622ae3d..ce6f681 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -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"
@@ -422,6 +424,7 @@ proc get_multilibs { args } {
break;
}
}
+ set mopts ""
if { [llength $args] > 0 } {
set mopts [lindex $args 0];
} else {
@@ -857,7 +860,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"