diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-17 17:05:38 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-03-17 17:07:22 -0700 |
| commit | 091021faaa699c11dd50d9ff56d8713953666f65 (patch) | |
| tree | 68fda6bf2e36093d43f941dde8d812f9dd9a2646 | |
| parent | 1757d5e7cf1ce94a2351f2a32d84a5883f50c8b9 (diff) | |
| download | binutils-gdb-091021faaa699c11dd50d9ff56d8713953666f65.tar.gz | |
Exclude target-zlib if target-libjava isn't built
* configure.ac (target_configdirs): Exclude target-zlib if
target-libjava isn't built.
* configure: Regenerated.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.ac | 12 |
3 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index f018cc4f271..9b1895b1937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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-03-17 H.J. Lu <hongjiu.lu@intel.com> + Sync with GCC 2014-06-13 Thomas Schwinge <thomas@codesourcery.com> diff --git a/configure b/configure index 9e543196ea7..b719d386764 100755 --- a/configure +++ b/configure @@ -6432,9 +6432,6 @@ Supported languages are: ${potential_languages}" "$LINENO" 5 ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" ` -else - # Disable all target libraries if not building gcc. - target_configdirs= fi # Handle --disable-<component> generically. @@ -6554,6 +6551,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 eaf46615e42..a4e4c7d835a 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,9 +2129,6 @@ Supported languages are: ${potential_languages}]) AC_SUBST(stage1_languages) ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" ` -else - # Disable all target libraries if not building gcc. - target_configdirs= fi # Handle --disable-<component> generically. @@ -2251,6 +2248,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 |