jdk8-mips64-public/hotspot: changeset 4602:e7e9e08147fc

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

     1.1 --- a/make/bsd/makefiles/vm.make	Thu Feb 14 14:33:35 2013 -0500
     1.2 +++ b/make/bsd/makefiles/vm.make	Thu Feb 14 12:36:07 2013 -0800
     1.3 @@ -94,7 +94,12 @@
     1.4  # This is VERY important! The version define must only be supplied to vm_version.o
     1.5  # If not, ccache will not re-use the cache at all, since the version string might contain
     1.6  # a time and date. 
     1.7 -vm_version.o: CXXFLAGS += ${JRE_VERSION} 
     1.8 +CXXFLAGS/vm_version.o += ${JRE_VERSION}
     1.9 +
    1.10 +CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
    1.11 +
    1.12 +# File specific flags
    1.13 +CXXFLAGS += $(CXXFLAGS/BYFILE)
    1.14  
    1.15  ifdef DEFAULT_LIBPATH
    1.16  CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""

     2.1 --- a/make/linux/makefiles/vm.make	Thu Feb 14 14:33:35 2013 -0500
     2.2 +++ b/make/linux/makefiles/vm.make	Thu Feb 14 12:36:07 2013 -0800
     2.3 @@ -100,7 +100,13 @@
     2.4  # This is VERY important! The version define must only be supplied to vm_version.o
     2.5  # If not, ccache will not re-use the cache at all, since the version string might contain
     2.6  # a time and date. 
     2.7 -vm_version.o: CXXFLAGS += ${JRE_VERSION}
     2.8 +CXXFLAGS/vm_version.o += ${JRE_VERSION}
     2.9 +
    2.10 +CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
    2.11 +
    2.12 +# File specific flags
    2.13 +CXXFLAGS += $(CXXFLAGS/BYFILE)
    2.14 +
    2.15  
    2.16  ifndef JAVASE_EMBEDDED 
    2.17  ifneq (${ARCH},arm)

     3.1 --- a/make/solaris/makefiles/vm.make	Thu Feb 14 14:33:35 2013 -0500
     3.2 +++ b/make/solaris/makefiles/vm.make	Thu Feb 14 12:36:07 2013 -0800
     3.3 @@ -88,7 +88,13 @@
     3.4  # This is VERY important! The version define must only be supplied to vm_version.o
     3.5  # If not, ccache will not re-use the cache at all, since the version string might contain
     3.6  # a time and date. 
     3.7 -vm_version.o: CXXFLAGS += ${JRE_VERSION} 
     3.8 +CXXFLAGS/vm_version.o += ${JRE_VERSION}
     3.9 +
    3.10 +CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
    3.11 +
    3.12 +# File specific flags
    3.13 +CXXFLAGS += $(CXXFLAGS/BYFILE)
    3.14 +
    3.15  
    3.16  # CFLAGS_WARN holds compiler options to suppress/enable warnings.
    3.17  CFLAGS += $(CFLAGS_WARN)

make/bsd/makefiles/vm.make		file \| annotate \| diff \| comparison \| revisions
make/linux/makefiles/vm.make		file \| annotate \| diff \| comparison \| revisions
make/solaris/makefiles/vm.make		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

8007639: Workaround for ccache in vm.make is incorrect