Mercurial > hg > graal-jvmci-8
comparison make/solaris/makefiles/vm.make @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | a7a93887b4c4 1b0dc9f87e75 |
children | 0f7ca53be929 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
86 ${VM_DISTRO} | 86 ${VM_DISTRO} |
87 | 87 |
88 # This is VERY important! The version define must only be supplied to vm_version.o | 88 # This is VERY important! The version define must only be supplied to vm_version.o |
89 # If not, ccache will not re-use the cache at all, since the version string might contain | 89 # If not, ccache will not re-use the cache at all, since the version string might contain |
90 # a time and date. | 90 # a time and date. |
91 vm_version.o: CXXFLAGS += ${JRE_VERSION} | 91 CXXFLAGS/vm_version.o += ${JRE_VERSION} |
92 | |
93 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) | |
94 | |
95 # File specific flags | |
96 CXXFLAGS += $(CXXFLAGS/BYFILE) | |
97 | |
92 | 98 |
93 # CFLAGS_WARN holds compiler options to suppress/enable warnings. | 99 # CFLAGS_WARN holds compiler options to suppress/enable warnings. |
94 CFLAGS += $(CFLAGS_WARN) | 100 CFLAGS += $(CFLAGS_WARN) |
95 | 101 |
96 # Do not use C++ exception handling | 102 # Do not use C++ exception handling |
345 include $(MAKEFILES_DIR)/jsig.make | 351 include $(MAKEFILES_DIR)/jsig.make |
346 | 352 |
347 # Serviceability agent | 353 # Serviceability agent |
348 include $(MAKEFILES_DIR)/saproc.make | 354 include $(MAKEFILES_DIR)/saproc.make |
349 | 355 |
350 # Whitebox testing API | 356 #---------------------------------------------------------------------- |
351 include $(MAKEFILES_DIR)/wb.make | 357 |
352 | 358 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck |
353 #---------------------------------------------------------------------- | |
354 | |
355 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR) | |
356 | 359 |
357 install: install_jvm install_jsig install_saproc | 360 install: install_jvm install_jsig install_saproc |
358 | 361 |
359 .PHONY: default build install install_jvm | 362 .PHONY: default build install install_jvm |