diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-11-22 18:02:04 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-11-22 18:02:04 (GMT) |
| commit | 0946ce59a09609b743b7dba40f7212778011f286 (patch) | |
| tree | aa666685885104ed985b4c743ad3222968e7ae54 /config/companion_tools.in | |
| parent | 3eb2e351f02d82fad255a9e6433c4c4d659c5de0 (diff) | |
| parent | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (diff) | |
Merge pull request #479 from stilor/gmake-link-fix
Gmake link fix
Diffstat (limited to 'config/companion_tools.in')
| -rw-r--r-- | config/companion_tools.in | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in index f922388..ece3552 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -2,14 +2,9 @@ menu "Companion tools" -# Tools that require make-3.81 to build should select this: -config COMP_TOOLS_make_3_81_NEEDED - bool - config COMP_TOOLS_FORCE_make_3_81 def_bool y - depends on COMP_TOOLS_make_3_81_NEEDED - depends on ! CONFIGURE_has_make381 + depends on ! CONFIGURE_has_make_3_81_or_newer select COMP_TOOLS select COMP_TOOLS_make @@ -20,7 +15,7 @@ config COMP_TOOLS prompt "Build some companion tools" help Crosstool-NG relies on some external tools to be recent enough, namely: - make = 3.81 (in some cases) + make >= 3.81 m4 >= 1.4.12 autoconf >= 2.63 automake >= 1.10.2 @@ -30,32 +25,7 @@ config COMP_TOOLS but you are strongly encouraged to update your system instead! if COMP_TOOLS - -config COMP_TOOLS_make - bool - prompt "make" - -config COMP_TOOLS_make_gmake - bool - prompt "Add gmake symlink to companion gnu/make" - depends on COMP_TOOLS_make - -config COMP_TOOLS_m4 - bool - prompt "m4" - -config COMP_TOOLS_autoconf - bool - prompt "autoconf" - -config COMP_TOOLS_automake - bool - prompt "automake" - -config COMP_TOOLS_libtool - bool - prompt "libtool" - +source "config.gen/companion_tools.in" endif endmenu |