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

Merge

Browse Source
This commit is contained in:
Ioi Lam 2015-12-22 00:08:38 +00:00
commit 365b569764
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hotspot/make/defs.make
View File

@ -124,30 +124,30 @@ include $(GAMMADIR)/make/jdk_version
# JDK_PREVIOUS_VERSION is only needed to facilitate standalone builds # JDK_PREVIOUS_VERSION is only needed to facilitate standalone builds
ifeq ($(JDK_PREVIOUS_VERSION),) ifeq ($(JDK_PREVIOUS_VERSION),)
JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION) export JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION)
endif endif
# Java versions needed # Java versions needed
ifeq ($(VERSION_MAJOR),) ifeq ($(VERSION_MAJOR),)
VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER) export VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
endif endif
ifeq ($(VERSION_MINOR),) ifeq ($(VERSION_MINOR),)
VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER) export VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
endif endif
ifeq ($(VERSION_SECURITY),) ifeq ($(VERSION_SECURITY),)
VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER) export VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
endif endif
ifeq ($(VERSION_PATCH),) ifeq ($(VERSION_PATCH),)
VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER) export VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
endif endif
ifeq ($(VERSION_BUILD),) ifeq ($(VERSION_BUILD),)
VERSION_BUILD=0 export VERSION_BUILD=0
endif endif
ifeq ($(VERSION_SHORT),) ifeq ($(VERSION_SHORT),)
VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY) export VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)
endif endif
ifeq ($(VERSION_STRING),) ifeq ($(VERSION_STRING),)
# Note that this is an extremely rough and incorrect approximation of a correct version string. # Note that this is an extremely rough and incorrect approximation of a correct version string.
VERSION_STRING=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)-internal export VERSION_STRING=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)-internal
endif endif
ifneq ($(HOTSPOT_RELEASE_VERSION),) ifneq ($(HOTSPOT_RELEASE_VERSION),)