On Jan 28, 2011, at 3:33 PM, John Coomes wrote:
Kelly O'Hair (kelly.oh...@oracle.com) wrote:
Need reviewer: change sanity check on make 3.81
7014301: Change make 3.81 sanity check to a fatal, 3.81 is needed now
Use of gnu make 3.81 or newer is required now, which should be
readily
available on all platforms.
I recommend a big heads-up. The solaris gnumake versions in
/java/devtools are 3.78.1 (can someone update them?), and solaris 10
ships with 3.80.
And our local copies of gnumake should not change, please do not
update them.
Our older jdk releases actually may not build with the newer GNU make.
Our internal copies of gnu make 3.81 will be called make381.
-kto
-John
The patch is rather trivial:
diff --git a/make/common/shared/Sanity.gmk b/make/common/shared/
Sanity.gmk
--- a/make/common/shared/Sanity.gmk
+++ b/make/common/shared/Sanity.gmk
@@ -255,10 +255,10 @@
MAKE_CHECK :=$(call CheckVersions,$(MAKE_VER),$(REQUIRED_MAKE_VER))
sane-make:
@if [ "$(MAKE_CHECK)" != "same" -a "$(MAKE_CHECK)" !=
"newer" ]; then \
- $(ECHO) "WARNING: The version of make being used is older
than \n" \
+ $(ECHO) "ERROR: The version of make being used is older
than
\n" \
" the required version of '$(REQUIRED_MAKE_VER)'.
\n" \
" The version of make found was '$(MAKE_VER)'. \n" \
- "" >> $(WARNING_FILE) ; \
+ "" >> $(ERROR_FILE) ; \
fi
######################################################
-kto
