Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 8095:fd32b88a87e9
Merge
author | poonam |
---|---|
date | Sat, 23 Feb 2013 17:40:33 -0800 |
parents | e7e9e08147fc |
children | 1b0dc9f87e75 |
comparison
equal
deleted
inserted
replaced
8094:f1fb03a251e9 | 8095:fd32b88a87e9 |
---|---|
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 |