# HG changeset patch # User ohair # Date 1205863594 25200 # Node ID 05173e59b8785ba423d0a582d06957596dce193d # Parent 5b0720709093938bc2e0d6e4522059d893462738 6674232: OPENJDK=false is same as OPENJDK=true Summary: OPENJDK should be empty (undefined) or "true". Reviewed-by: tbell diff -r 5b0720709093 -r 05173e59b878 jdk/make/common/Defs.gmk --- a/jdk/make/common/Defs.gmk Tue Mar 18 11:04:42 2008 -0700 +++ b/jdk/make/common/Defs.gmk Tue Mar 18 11:06:34 2008 -0700 @@ -32,6 +32,13 @@ # So when it includes other files, it must use JDK_TOPDIR. # +# Check for strange explicit settings (change to empty or true) +ifdef OPENJDK + ifneq ($(OPENJDK),true) + x:=$(error "OPENJDK (if defined) can only be set to true") + endif +endif + # # On Solaris, the 'make' utility from Sun will not work with these makefiles. # This little rule is only understood by Sun's make, and is harmless @@ -87,19 +94,6 @@ OPENJDK = true endif -# Check for strange explicit settings (change to empty or true) -ifdef OPENJDK - ifeq ($(OPENJDK),false) - # Silently treat as not defined - OPENJDK = - else - ifneq ($(OPENJDK),true) - dummy := $(warning "WARNING: OPENKJDK=$(OPENJDK) being treated as true") - OPENJDK = true - endif - endif -endif - # Define where closed directories are ifdef OPENJDK CLOSED_SRC =