Tue, 18 Mar 2008 11:01:40 -0700
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
make/Defs-internal.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Defs-internal.gmk Thu Mar 13 16:12:15 2008 -0700 1.2 +++ b/make/Defs-internal.gmk Tue Mar 18 11:01:40 2008 -0700 1.3 @@ -28,6 +28,12 @@ 1.4 # not contain rules. 1.5 # 1.6 1.7 +ifdef OPENJDK 1.8 + ifneq ($(OPENJDK),true) 1.9 + x:=$(error "OPENJDK (if defined) can only be set to true") 1.10 + endif 1.11 +endif 1.12 + 1.13 # Define absolute paths to TOPDIRs 1.14 ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") 1.15 ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") 1.16 @@ -96,10 +102,8 @@ 1.17 endif 1.18 ifeq ($(JDK_SRC_AVAILABLE),true) 1.19 JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) 1.20 - ifndef OPENJDK 1.21 - ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) 1.22 - OPENJDK = true 1.23 - endif 1.24 + ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) 1.25 + OPENJDK = true 1.26 endif 1.27 endif 1.28