1.1 --- a/make/solaris/makefiles/vm.make Mon Jan 09 10:27:24 2012 +0100 1.2 +++ b/make/solaris/makefiles/vm.make Wed Jan 11 17:34:02 2012 -0500 1.3 @@ -93,7 +93,7 @@ 1.4 CFLAGS += $(CFLAGS/NOEX) 1.5 1.6 # Extra flags from gnumake's invocation or environment 1.7 -CFLAGS += $(EXTRA_CFLAGS) 1.8 +CFLAGS += $(EXTRA_CFLAGS) -DINCLUDE_TRACE 1.9 1.10 # Math Library (libm.so), do not use -lm. 1.11 # There might be two versions of libm.so on the build system: 1.12 @@ -160,6 +160,10 @@ 1.13 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 1.14 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 1.15 1.16 +SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ 1.17 + find $(HS_ALT_SRC)/share/vm/jfr -type d; \ 1.18 + fi) 1.19 + 1.20 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 1.21 CORE_PATHS+=$(GENERATED)/jvmtifiles 1.22