stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6674232: OPENJDK=false is same as OPENJDK=true

Browse Source 
If OPENJDK has a value, that value must be "true", empty value == undefined with GNU make.

Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2008-03-18 11:01:40 -07:00
parent db98b5b071
commit 3bcb138820
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make/Defs-internal.gmk
View File

@ -28,6 +28,12 @@
# not contain rules. # 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 # Define absolute paths to TOPDIRs
ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)")
ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)")
@ -96,11 +102,9 @@ ifndef BUILD_JDK
endif endif
ifeq ($(JDK_SRC_AVAILABLE),true) ifeq ($(JDK_SRC_AVAILABLE),true)
JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed)
ifndef OPENJDK
ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false)
OPENJDK = true OPENJDK = true
endif endif
endif
endif endif
DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)