* configure.in (noconfigdirs): Do not add target-newlib if

	target == i[3456]86-*-linux*, and host == target.

2 files changed, 20 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a68118fca..e5a4345d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.in (noconfigdirs): Do not add target-newlib if
+	target == i[3456]86-*-linux*, and host == target.
+
 2002-04-29  Mark Mitchell  <mark@codesourcery.com>
 
 	* config.guess: Updated to 2002-04-26's version.
diff --git a/configure.in b/configure.in
index b50ea1fd9..45492a19e 100644
--- a/configure.in
+++ b/configure.in
@@ -806,6 +806,20 @@ case "${target}" in
     # linux has rx in libc
     skipdirs="$skipdirs target-librx"
     ;;
+  i[3456]86-*-linux*)
+    # This section makes it possible to build newlib natively on linux.
+    # If we are using a cross compiler then don't configure newlib.
+    if [ x${is_cross_compiler} != xno ] ; then
+         noconfigdirs="$noconfigdirs target-newlib"
+    fi
+    noconfigdirs="$noconfigdirs target-libgloss"
+    # If we are not using a cross compiler, do configure newlib.
+    # Note however, that newlib will only be configured in this situation
+    # if the --with-newlib option has been given, because otherwise
+    # 'target-newlib' will appear in skipdirs.
+    # linux has rx in libc
+    skipdirs="$skipdirs target-librx"
+    ;;
   *-*-linux*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     # linux has rx in libc
@@ -1506,7 +1520,7 @@ case " $skipdirs " in
    fi
 
    case "${target}-${is_cross_compiler}" in
-   i[3456]86-pc-linux*-no)
+   i[3456]86-*-linux*-no)
       # Here host == target, so we don't need to build gcc,
       # so we don't want to discard standard headers.
       FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`