From 8a6ab6a0bdb2de827dfa66f2447e0f02d229c9f6 Mon Sep 17 00:00:00 2001 From: hjl Date: Tue, 14 Jul 2015 15:32:05 +0000 Subject: [PATCH] Sync toplevel configure with binutils-gdb Sync with binutils-gdb: 2015-03-17 H.J. Lu * 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 --- ChangeLog | 9 +++++++++ configure | 9 +++++++++ configure.ac | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 27edb46..c1582b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ 2015-07-14 H.J. Lu Sync with binutils-gdb: + 2015-03-17 H.J. Lu + + * configure.ac (target_configdirs): Exclude target-zlib if + target-libjava isn't built. + * configure: Regenerated. + +2015-07-14 H.J. Lu + + Sync with binutils-gdb: 2015-05-13 John David Anglin * configure.ac: Disable configuration of GDB for HPUX targets. diff --git a/configure b/configure index f060986..5ba9489 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 diff --git a/configure.ac b/configure.ac index 603bdf6..2ff9be0 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- 2.7.4