diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2014-02-20 18:23:08 +0000 |
|---|---|---|
| committer | Ray Donnelly <mingw.android@gmail.com> | 2014-02-20 18:23:08 +0000 |
| commit | 7cd670ce068034f9575c4dab5bdc2ad4afb3fba8 (patch) | |
| tree | c4960769037606b22f122674db355576073d8216 | |
| parent | 8cf275835240b78a2af17d7a5cdcfd2fdc06a8ad (diff) | |
| download | crosstool-ng-7cd670ce068034f9575c4dab5bdc2ad4afb3fba8.tar.gz crosstool-ng-7cd670ce068034f9575c4dab5bdc2ad4afb3fba8.tar.bz2 crosstool-ng-7cd670ce068034f9575c4dab5bdc2ad4afb3fba8.zip | |
If GNU make 3.81 is not found then build it as a companion tool.
Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
[yann.morin.1998@free.fr: add message "checking for make 3.81"]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <8b8bf6998f3d239f6c74.1392920971@advancedsearch.virginmedia.com>
Patchwork-Id: 322302
| -rw-r--r-- | config/companion_tools.in | 8 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 22 insertions, 0 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in index c311b580..ea6724f5 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -2,7 +2,15 @@ menu "Companion tools" +config COMP_TOOLS_make_3_81_NEEDED + bool + depends on ! CONFIGURE_has_make381 + default y + select COMP_TOOLS + select COMP_TOOLS_make + comment "READ HELP before you say 'Y' below !!!" + config COMP_TOOLS bool prompt "Build some companion tools" diff --git a/configure.ac b/configure.ac index a8a615b8..ce26b1c8 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,20 @@ AC_CACHE_CHECK([for GNU make >= 3.80], [ac_cv_path_MAKE], AC_SUBST([MAKE], [$ac_cv_path_MAKE]) AC_PROG_MAKE_SET +# Check for GNU make 3.81 exactly, otherwise +# it will be built as a companion tool. +AC_MSG_CHECKING([for make 3.81]) +AS_IF( + [test "$MAKE_ver" = "GNU Make 3.81"], + [make381="y" + AC_MSG_RESULT([yes]) + ], + [make381= + AC_MSG_RESULT([no]) + ] + ) +ACX_SET_KCONFIG_OPTION([make381]) + #---------------------------------------- # Check for libtool >= 1.5.26 AC_CACHE_VAL([ac_cv_path_LIBTOOL], |