Change how we check that we have a suitable 'make'

We now check in the same way that the testsuite does.
ghc · Jun 9, 2013 · 96eca81 · 96eca81
1 parent 22690c9
commit 96eca81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/ghc.mk b/ghc.mk
@@ -76,6 +76,23 @@
 
 default : all
 
+
+##################################################
+# Check that we have a new enough 'make'
+
+HAVE_EVAL := NO
+$(eval HAVE_EVAL := YES)
+
+ifeq "$(HAVE_EVAL)" "NO"
+$(error Your make does not support eval. You need GNU make >= 3.81)
+endif
+
+ifeq "$(abspath /)" ""
+$(error Your make does not support abspath. You need GNU make >= 3.81)
+endif
+##################################################
+
+
 # Catch make if it runs away into an infinite loop
 ifeq      "$(MAKE_RESTARTS)" ""
 else ifeq "$(MAKE_RESTARTS)" "1"

diff --git a/mk/tree.mk b/mk/tree.mk
@@ -1,10 +1,4 @@
 
-ifneq "$(findstring 3.7, $(MAKE_VERSION))" ""
-ifeq "$(findstring 3.79.1, $(MAKE_VERSION))" ""
-$(error GNU make version 3.79.1 or later is required.)
-endif
-endif
-
 ################################################################################
 #
 #	Layout of the source tree