70 else |
70 else |
71 SYMFLAG = |
71 SYMFLAG = |
72 endif |
72 endif |
73 endif |
73 endif |
74 |
74 |
75 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined |
|
76 # in $(GAMMADIR)/make/defs.make |
|
77 ifeq ($(HOTSPOT_BUILD_VERSION),) |
|
78 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)\"" |
|
79 else |
|
80 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)\"" |
|
81 endif |
|
82 |
|
83 # The following variables are defined in the generated flags.make file. |
75 # The following variables are defined in the generated flags.make file. |
84 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" |
76 JDK_VER_DEFS = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \ |
85 JRE_VERSION = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" |
77 -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \ |
|
78 -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \ |
|
79 -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\"" |
|
80 VM_VER_DEFS = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \ |
|
81 -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" \ |
|
82 $(JDK_VER_DEFS) |
86 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" |
83 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" |
87 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" |
84 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" |
88 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" |
85 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" |
89 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" |
86 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" |
90 |
87 |
91 CXXFLAGS = \ |
88 CXXFLAGS = \ |
92 ${SYSDEFS} \ |
89 ${SYSDEFS} \ |
93 ${INCLUDES} \ |
90 ${INCLUDES} \ |
94 ${BUILD_VERSION} \ |
|
95 ${BUILD_TARGET} \ |
91 ${BUILD_TARGET} \ |
96 ${BUILD_USER} \ |
92 ${BUILD_USER} \ |
97 ${HS_LIB_ARCH} \ |
93 ${HS_LIB_ARCH} \ |
98 ${VM_DISTRO} |
94 ${VM_DISTRO} |
99 |
95 |
100 # This is VERY important! The version define must only be supplied to vm_version.o |
96 # This is VERY important! The version define must only be supplied to vm_version.o |
101 # If not, ccache will not re-use the cache at all, since the version string might contain |
97 # If not, ccache will not re-use the cache at all, since the version string might contain |
102 # a time and date. |
98 # a time and date. |
103 CXXFLAGS/vm_version.o += ${JRE_VERSION} |
99 CXXFLAGS/vm_version.o += ${VM_VER_DEFS} |
104 |
100 |
105 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) |
101 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) |
106 |
102 |
107 # File specific flags |
103 # File specific flags |
108 CXXFLAGS += $(CXXFLAGS/BYFILE) |
104 CXXFLAGS += $(CXXFLAGS/BYFILE) |