2005-05-17 Kelley Cook <kcook@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / configure.in

diff --git a/configure.in b/configure.in
index 64dad1b..5dd40ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -481,9 +481,14 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
     ;;
   cris-*-* | crisv32-*-*)
+    libgcj_ex_libffi=`echo ${libgcj} | sed -e 's/target-libffi//'`
     case "${target}" in
-      *-*-elf | *-*-aout)
+      *-*-aout)
        noconfigdirs="$noconfigdirs ${libgcj}";;
+      *-*-elf)
+       noconfigdirs="$noconfigdirs ${libgcj_ex_libffi}";;
+      *-*-linux*)
+       noconfigdirs="$noconfigdirs ${libgcj_ex_libffi} target-newlib target-libgloss";;
       *)
        noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
     esac
@@ -1923,8 +1928,10 @@ fi
 # fixed in future.  It's still worthwhile to use a cache file for each
 # directory.  I think.
 
-# Pass the appropriate --host, --build, and --cache-file arguments.
-target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
+# Pass the appropriate --build, --host, --target and --cache-file arguments.
+# We need to pass --target, as newer autoconf's requires consistency
+# for target_alias and gcc doesn't manage it consistently.
+target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
 
 FLAGS_FOR_TARGET=
 case " $target_configdirs " in