Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 8124:5fc51c1ecdeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 989155e2d07a 1b0dc9f87e75
children 0f3fe35513a0
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
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
384 include $(MAKEFILES_DIR)/jsig.make 390 include $(MAKEFILES_DIR)/jsig.make
385 391
386 # Serviceability agent 392 # Serviceability agent
387 include $(MAKEFILES_DIR)/saproc.make 393 include $(MAKEFILES_DIR)/saproc.make
388 394
389 # Whitebox testing API
390 include $(MAKEFILES_DIR)/wb.make
391
392 #---------------------------------------------------------------------- 395 #----------------------------------------------------------------------
393 396
394 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR) 397 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck
395 398
396 install: install_jvm install_jsig install_saproc 399 install: install_jvm install_jsig install_saproc
397 400
398 .PHONY: default build install install_jvm 401 .PHONY: default build install install_jvm