From d9328a80c405737b5db5794e4b7f4e7d9574e8ba Mon Sep 17 00:00:00 2001 From: David Katleman Date: Tue, 22 Oct 2013 16:35:09 -0700 Subject: [PATCH] 8027068: Update to NewMakefile.gmk check of MAKE_VERSION broke jdk8-build nightly builds on windows, saying 3.82.90 is too low Reviewed-by: ihse, tbell, wetmore --- NewMakefile.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewMakefile.gmk b/NewMakefile.gmk index ffdcbcc7dd0..a3389ff7278 100644 --- a/NewMakefile.gmk +++ b/NewMakefile.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ default: TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1 # Assume we have GNU make, but check version. -ifeq ($(strip $(foreach v, 3.81 3.82 4.%, $(filter $v, $(MAKE_VERSION)))), ) +ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), ) $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) endif