summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2015-07-14 15:32:05 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2015-07-14 08:32:05 -0700
commitf15956030406d19f8476ad1c96ea159fce19cac9 (patch)
tree0d76e440c0c995484c86d69802e30fe5aaf3bbac /configure
parenta05c2c752e1b7cfc30f8b857720f61a5dd3c048f (diff)
downloadgcc-f15956030406d19f8476ad1c96ea159fce19cac9.tar.gz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure b/configure
index f0609865f6f..5ba9489d1e9 100755
--- a/configure
+++ b/configure
@@ -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