yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude target-zlib if target-libjava isn't built

Browse Source 
* configure.ac (target_configdirs): Exclude target-zlib if
	target-libjava isn't built.
	* configure: Regenerated.
This commit is contained in:
H.J. Lu 2015-03-17 17:05:38 -07:00
parent 1757d5e7cf
commit 091021faaa
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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

12
configure vendored
View File

@ -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

12
configure.ac
View File

@ -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