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