Mercurial > hg > graal-jvmci-8

comparison make/defs.make @ 23189:47110b037994 hs25.66-b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8079410: Hotspot version to share the same update and build version from JDK Reviewed-by: dholmes, dcubed
author amurillo
date Tue, 21 Jul 2015 15:35:12 -0700
parents ddce0b7cee93
children dd9cc155639c c649dde41041
comparison
equal deleted inserted replaced
23188:366edb34d01b 23189:47110b037994
114 endif 114 endif
115 115
116 # hotspot version definitions 116 # hotspot version definitions
117 include $(GAMMADIR)/make/hotspot_version 117 include $(GAMMADIR)/make/hotspot_version
118 118
119 # When config parameter --with-update-version is defined,
120 # Hotspot minor version should be set to that
121 ifneq ($(JDK_UPDATE_VERSION),)
122 HS_MINOR_VER=$(JDK_UPDATE_VERSION)
123 endif
124
125 # When config parameter --with-build-number is defined,
126 # Hotspot build number should be set to that
127 ifneq ($(JDK_BUILD_NUMBER),)
128 HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER))
129 endif
130
119 # Java versions needed 131 # Java versions needed
120 ifeq ($(PREVIOUS_JDK_VERSION),) 132 ifeq ($(PREVIOUS_JDK_VERSION),)
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) 133 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
122 endif 134 endif
123 ifeq ($(JDK_MAJOR_VERSION),) 135 ifeq ($(JDK_MAJOR_VERSION),)