Merge
authoriklam
Tue, 22 Dec 2015 00:08:38 +0000
changeset 35209 b2f409087683
parent 35207 a80789b54a6d (current diff)
parent 35208 5fdd97c85f49 (diff)
child 35210 eb1d5c68bf64
child 35212 7a6d0993a080
Merge
--- a/hotspot/make/defs.make	Mon Dec 21 22:45:54 2015 +0100
+++ b/hotspot/make/defs.make	Tue Dec 22 00:08:38 2015 +0000
@@ -124,30 +124,30 @@
 
 # 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),)