Sync toplevel configure with binutils-gdb

Sync with binutils-gdb:
	2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.ac (target_configdirs): Exclude target-zlib if
	target-libjava isn't built.
	* configure: Regenerated.

From-SVN: r225778
This commit is contained in:
H.J. Lu 2015-07-14 15:32:05 +00:00 committed by H.J. Lu
parent a05c2c752e
commit f159560304
3 changed files with 27 additions and 0 deletions

View File

@ -1,3 +1,12 @@
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
Sync with binutils-gdb:
2015-03-17 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (target_configdirs): Exclude target-zlib if
target-libjava isn't built.
* configure: Regenerated.
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
Sync with binutils-gdb:

9
configure vendored
View File

@ -6575,6 +6575,15 @@ for i in ${target_configdirs_all} ; do
fi
done
# Exclude target-zlib if target-libjava isn't built.
case ${target_configdirs} in
*target-libjava*)
;;
*)
target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
;;
esac
# 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

View File

@ -2265,6 +2265,15 @@ for i in ${target_configdirs_all} ; do
fi
done
# Exclude target-zlib if target-libjava isn't built.
case ${target_configdirs} in
*target-libjava*)
;;
*)
target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
;;
esac
# 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