8145271: stand-alone hotspot build is broken

Reviewed-by: ihse
This commit is contained in:
Ioi Lam 2015-12-21 13:58:56 -08:00
parent aaad04a655
commit bf1b5cea33

View File

@ -124,30 +124,30 @@ include $(GAMMADIR)/make/jdk_version
# JDK_PREVIOUS_VERSION is only needed to facilitate standalone builds
ifeq ($(JDK_PREVIOUS_VERSION),)
JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION)
export JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION)
endif
# Java versions needed
ifeq ($(VERSION_MAJOR),)
VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
export VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
endif
ifeq ($(VERSION_MINOR),)
VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
export VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
endif
ifeq ($(VERSION_SECURITY),)
VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
export VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
endif
ifeq ($(VERSION_PATCH),)
VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
export VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
endif
ifeq ($(VERSION_BUILD),)
VERSION_BUILD=0
export VERSION_BUILD=0
endif
ifeq ($(VERSION_SHORT),)
VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)
export VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)
endif
ifeq ($(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
ifneq ($(HOTSPOT_RELEASE_VERSION),)