@@ -6432,9 +6432,6 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
- # Disable all target libraries if not building gcc.
- target_configdirs=
fi
# Handle --disable-<component> generically.
@@ -6554,6 +6551,13 @@ for i in ${target_configdirs_all} ; do
fi
done
+# Exclude target-zlib if target-libjava isn't built.
+if echo " ${target_configdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+ :
+else
+ target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+fi
+
# libiberty-linker-plugin is special: it doesn't have its own source directory,
# so we have to add it after the preceding checks.
if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
@@ -2129,9 +2129,6 @@ Supported languages are: ${potential_languages}])
AC_SUBST(stage1_languages)
ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
- # Disable all target libraries if not building gcc.
- target_configdirs=
fi
# Handle --disable-<component> generically.
@@ -2251,6 +2248,13 @@ for i in ${target_configdirs_all} ; do
fi
done
+# Exclude target-zlib if target-libjava isn't built.
+if echo " ${target_configdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+ :
+else
+ target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+fi
+
# libiberty-linker-plugin is special: it doesn't have its own source directory,
# so we have to add it after the preceding checks.
if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x