aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2014-12-07 15:57:11 +0100
committerBryan Hundven <bryanhundven@gmail.com>2015-01-08 19:15:51 -0800
commitc88bbca7ab489fc8cf9ca34b9878e8b8be23f668 (patch)
tree00719a2d01969688e2b1825e1f2fb4e29e1078fb
parent2ba44bb7619ad28238d29386da89989fedaff9a8 (diff)
downloadcrosstool-ng-c88bbca7ab489fc8cf9ca34b9878e8b8be23f668.tar.gz
crosstool-ng-c88bbca7ab489fc8cf9ca34b9878e8b8be23f668.tar.bz2
crosstool-ng-c88bbca7ab489fc8cf9ca34b9878e8b8be23f668.zip
comptools/make: Install 'gmake' symlink
We had following problem: We're building a toolchain with an old glibc version for compatibility with old Linux distributions (glibc 2.9). This version requires make < 4 to build. However, the configure script of glibc looks for make in the order "gnumake", "gmake" and "make". So when "gmake" is available in the system (which is the case on Gentoo Linux per default, unfortunately), then configure finds the system gmake 4.1 instead of the ct-ng make 3.82. This patch adds an option to install a symlink so that 'gmake' is also available in the old version when building toolchains. Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
-rw-r--r--config/companion_tools.in5
-rw-r--r--scripts/build/companion_tools/050-make.sh3
2 files changed, 8 insertions, 0 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in
index 18811e6b..f9223884 100644
--- a/config/companion_tools.in
+++ b/config/companion_tools.in
@@ -35,6 +35,11 @@ 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"
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 601e2673..42475458 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -22,6 +22,9 @@ do_companion_tools_make_build() {
--prefix="${CT_BUILDTOOLS_PREFIX_DIR}"
CT_DoExecLog ALL make
CT_DoExecLog ALL make install
+ if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then
+ CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake"
+ fi
CT_Popd
CT_EndStep
}