Mercurial > hg > graal-compiler
changeset 8063:f35f1fbab3e1
Merge
| author | sla |
|---|---|
| date | Fri, 15 Feb 2013 10:08:25 +0100 |
| parents | e7e9e08147fc (diff) 5d5c577296fd (current diff) |
| children | dc1de5e78a85 |
| files | |
| diffstat | 3 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/vm.make Fri Feb 15 08:54:12 2013 +0100 +++ b/make/bsd/makefiles/vm.make Fri Feb 15 10:08:25 2013 +0100 @@ -94,7 +94,12 @@ # 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: CXXFLAGS += ${JRE_VERSION} +CXXFLAGS/vm_version.o += ${JRE_VERSION} + +CXXFLAGS/BYFILE = $(CXXFLAGS/$@) + +# File specific flags +CXXFLAGS += $(CXXFLAGS/BYFILE) ifdef DEFAULT_LIBPATH CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
--- a/make/linux/makefiles/vm.make Fri Feb 15 08:54:12 2013 +0100 +++ b/make/linux/makefiles/vm.make Fri Feb 15 10:08:25 2013 +0100 @@ -100,7 +100,13 @@ # 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: CXXFLAGS += ${JRE_VERSION} +CXXFLAGS/vm_version.o += ${JRE_VERSION} + +CXXFLAGS/BYFILE = $(CXXFLAGS/$@) + +# File specific flags +CXXFLAGS += $(CXXFLAGS/BYFILE) + ifndef JAVASE_EMBEDDED ifneq (${ARCH},arm)
--- a/make/solaris/makefiles/vm.make Fri Feb 15 08:54:12 2013 +0100 +++ b/make/solaris/makefiles/vm.make Fri Feb 15 10:08:25 2013 +0100 @@ -88,7 +88,13 @@ # 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: CXXFLAGS += ${JRE_VERSION} +CXXFLAGS/vm_version.o += ${JRE_VERSION} + +CXXFLAGS/BYFILE = $(CXXFLAGS/$@) + +# File specific flags +CXXFLAGS += $(CXXFLAGS/BYFILE) + # CFLAGS_WARN holds compiler options to suppress/enable warnings. CFLAGS += $(CFLAGS_WARN)