# HG changeset patch # User ohair # Date 1205863300 25200 # Node ID 1a94d6d22dbb5ee05c4b46eae68eb43cbfffe89a # Parent d840592860e45dec68bc5cad258b912da2b969f1 6674232: OPENJDK=false is same as OPENJDK=true Summary: If OPENJDK has a value, that value must be "true", empty value == undefined with GNU make. Reviewed-by: tbell diff -r d840592860e4 -r 1a94d6d22dbb make/Defs-internal.gmk --- a/make/Defs-internal.gmk Thu Mar 13 16:12:15 2008 -0700 +++ b/make/Defs-internal.gmk Tue Mar 18 11:01:40 2008 -0700 @@ -28,6 +28,12 @@ # not contain rules. # +ifdef OPENJDK + ifneq ($(OPENJDK),true) + x:=$(error "OPENJDK (if defined) can only be set to true") + endif +endif + # Define absolute paths to TOPDIRs ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") @@ -96,10 +102,8 @@ endif ifeq ($(JDK_SRC_AVAILABLE),true) JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) - ifndef OPENJDK - ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) - OPENJDK = true - endif + ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) + OPENJDK = true endif endif