Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 8061:e7e9e08147fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8007639: Workaround for ccache in vm.make is incorrect Summary: Fixed makefile logic to correctly special case JRE_RELEASE_VERSION and vm_version.o Reviewed-by: dholmes, erikj
author mikael
date Thu, 14 Feb 2013 12:36:07 -0800
parents 892acf0431ef
children 1b0dc9f87e75
comparison
equal deleted inserted replaced
8060:3a531d40ad93 8061:e7e9e08147fc
98 ${VM_DISTRO} 98 ${VM_DISTRO}
99 99
100 # This is VERY important! The version define must only be supplied to vm_version.o 100 # 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 101 # If not, ccache will not re-use the cache at all, since the version string might contain
102 # a time and date. 102 # a time and date.
103 vm_version.o: CXXFLAGS += ${JRE_VERSION} 103 CXXFLAGS/vm_version.o += ${JRE_VERSION}
104
105 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
106
107 # File specific flags
108 CXXFLAGS += $(CXXFLAGS/BYFILE)
109
104 110
105 ifndef JAVASE_EMBEDDED 111 ifndef JAVASE_EMBEDDED
106 ifneq (${ARCH},arm) 112 ifneq (${ARCH},arm)
107 CFLAGS += -DINCLUDE_TRACE 113 CFLAGS += -DINCLUDE_TRACE
108 endif 114 endif