summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2015-07-14 15:32:05 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2015-07-14 15:32:05 +0000
commit8a6ab6a0bdb2de827dfa66f2447e0f02d229c9f6 (patch)
tree0d76e440c0c995484c86d69802e30fe5aaf3bbac /configure
parent6406d366f7883c84bae0b3a231283c288df73ec4 (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225778 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure b/configure
index f0609865f6f8..5ba9489d1e91 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