path: root/scripts
diff options
authorAlexey Neyman <>2017-01-27 05:05:17 (GMT)
committerAlexey Neyman <>2017-01-28 04:40:47 (GMT)
commit7a94c81e5bf171d1258aa60438482fd44e5f9800 (patch)
treeca62d7a573dd46eefceeb56bf494ba2b1a697016 /scripts
parent0636034688b0d03577ae1b543c92ebab90d14c68 (diff)
Rework configure logic wrt GNU autotools
Rather than requiring them of a certain version, detect if they are present (and have sufficient version) and select an appropriate companion tool otherwise. The reason is that, for example, most recent gettext requires automake 1.15, but the newest available CentOS has 1.13. Hence, the option to "upgrade your system" does not apply, and the warning comment above the companion tools is rather scary. With this approach, it will work out of the box - either by using the host's tools, or by building them as needed. Note that the user can still change the setting in the config. While there, propagate the new version checking macro to awk/bash/host binutils, and switch from --with-foo=xxx to officially blessed FOO=xxx: the latter does not require checking for bogus values (i.e., --with-foo, --without-foo) and AC_PROG_* macros recognize the corresponding settings without further modifications. For now, I kept --with-foo=, if only to complain and steer people to the new way. To be cleaned up after a release. Signed-off-by: Alexey Neyman <>
Diffstat (limited to 'scripts')
1 files changed, 4 insertions, 19 deletions
diff --git a/scripts/build/ b/scripts/build/
index 415f3a2..b190ed7 100644
--- a/scripts/build/
+++ b/scripts/build/
@@ -31,23 +31,6 @@ do_companion_tools_extract() {
# Build the companion tools facilities for build
do_companion_tools_for_build() {
- # Skip out if:
- # - native/cross, and companion tools were neither selected
- # to be built, nor included in the final toolchain
- # - canadian/cross-native, and companion tools were not
- # selected to be built
- case "${CT_TOOLCHAIN_TYPE}" in
- native|cross)
- if [ -z "${CT_COMP_TOOLS}${CT_COMP_TOOLS_FOR_HOST}" ]; then
- return
- fi
- ;;
- canadian|cross-native)
- if [ -z "${CT_COMP_TOOLS}" ]; then
- return
- fi
- ;;
- esac
@@ -55,12 +38,14 @@ do_companion_tools_for_build() {
# Build the companion tools facilities for host
do_companion_tools_for_host() {
- # For native/cross, build==host, and the tools were built
- # earlier by do_companion_tools_for_build.
case "${CT_TOOLCHAIN_TYPE}" in
+ # For native/cross, build==host, skip: the tools were built
+ # earlier by do_companion_tools_for_build.
+ # For canadian/cross-native, only need to build tools for host
+ # if explicitly requested.
if [ -z "${CT_COMP_TOOLS_FOR_HOST}" ]; then