Mercurial > hg > truffle

comparison make/bsd/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
92 ${VM_DISTRO} 92 ${VM_DISTRO}
93 93
94 # This is VERY important! The version define must only be supplied to vm_version.o 94 # This is VERY important! The version define must only be supplied to vm_version.o
95 # If not, ccache will not re-use the cache at all, since the version string might contain 95 # If not, ccache will not re-use the cache at all, since the version string might contain
96 # a time and date. 96 # a time and date.
97 vm_version.o: CXXFLAGS += ${JRE_VERSION} 97 CXXFLAGS/vm_version.o += ${JRE_VERSION}
98
99 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
100
101 # File specific flags
102 CXXFLAGS += $(CXXFLAGS/BYFILE)
98 103
99 ifdef DEFAULT_LIBPATH 104 ifdef DEFAULT_LIBPATH
100 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" 105 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
101 endif 106 endif
102 107