diff make/bsd/makefiles/vm.make @ 4890:c77d473e71f7

7132779: build-infra merge: Enable ccache to work for most developer builds. Summary: When a build number is not specified, the JRE_RELEASE_VERSION define contains a date and timestamp. Thus ccache cannot cache the object files for longer than a minute since the define is passed to the compilation of all source files. This change passes JRE_RELEASE_VERSION only to vm_version.cpp and adds a function jre_release_version() to Abstract_VM_Version. This allows all other source files to be ccached. Reviewed-by: ohair, rottenha Contributed-by: fredrik.ohrstrom@oracle.com
author ohrstrom
date Tue, 31 Jan 2012 13:12:39 +0100
parents e8a4934564b2
children 719f7007c8e8
line wrap: on
line diff
--- a/make/bsd/makefiles/vm.make	Fri Feb 03 17:21:52 2012 -0500
+++ b/make/bsd/makefiles/vm.make	Tue Jan 31 13:12:39 2012 +0100
@@ -89,9 +89,13 @@
   ${BUILD_TARGET}    \
   ${BUILD_USER}      \
   ${HS_LIB_ARCH}     \
-  ${JRE_VERSION}     \
   ${VM_DISTRO}
 
+# This is VERY important! The version define must only be supplied to vm_version.o
+# If not, ccache will not re-use the cache at all, since the version string might contain
+# a time and date. 
+vm_version.o: CPPFLAGS += ${JRE_VERSION} 
+
 ifdef DEFAULT_LIBPATH
 CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
 endif