From 7a604b393b51c196e765cf0e7121b56fc96b02f4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Fri, 21 Sep 2018 18:29:41 +0200
Subject: prereq: gnu make 4 required for latest glibc

---
 scripts/prereq.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/prereq.sh b/scripts/prereq.sh
index c1ae599a7..91825f2db 100755
--- a/scripts/prereq.sh
+++ b/scripts/prereq.sh
@@ -188,8 +188,13 @@ for makebin in $makebins; do
     if [ $? -eq 0 ]; then
       printf "yes\n"
       MAKE=$(which $makebin)
-      break
-    else
+    fi
+      printf " --->  checking if it is make 4.x.. "
+      LC_ALL=C $makebin --version 2>/dev/null| grep -i "Make 4" >/dev/null
+      if [ $? -eq 0 ]; then
+        printf "yes\n"
+        break
+      else
       # we need to build GNU make
       printf "no\n"
       printf " --->  compiling missing GNU make.. "
@@ -204,12 +209,13 @@ for makebin in $makebins; do
       cd tmp
       tar xzf ../dl/make-${makever}.tar.gz
       cd make-$makever
-      ./configure --prefix=$topdir/host_$gnu_host_name/
+      ./configure --prefix=$topdir/host_$gnu_host_name
       make
       make install
       cd ..
       cd ..
       rm -rf tmp
+      (cd $topdir/host_$gnu_host_name/bin/; ln -sf make gnumake)
       MAKE=$topdir/host_$gnu_host_name/bin/make
       makebin=$topdir/host_$gnu_host_name/bin/make
       printf " done\n"
-- 
cgit v1.2.3