diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2015-07-14 15:32:05 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2015-07-14 15:32:05 +0000 |
| commit | 18bb05a2232e8a1dce51135cd72b3a119780db8a (patch) | |
| tree | 0d76e440c0c995484c86d69802e30fe5aaf3bbac | |
| parent | 672daf5b1ccb8fbae3839ee15d5b441a905d5493 (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: https://gcc.gnu.org/svn/gcc/trunk@225778 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 27edb460dbc..c1582b9afdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ 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: 2015-05-13 John David Anglin <dave.anglin@bell.net> * configure.ac: Disable configuration of GDB for HPUX targets. 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 diff --git a/configure.ac b/configure.ac index 603bdf6f9fb..2ff9be008cd 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 |