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