diff -r cc19612c6b9f -r 91935236600e hotspot/make/bsd/makefiles/top.make --- a/hotspot/make/bsd/makefiles/top.make Mon Oct 10 21:01:36 2011 -0400 +++ b/hotspot/make/bsd/makefiles/top.make Thu Oct 13 09:35:42 2011 -0700 @@ -82,7 +82,7 @@ @echo All done. # This is an explicit dependency for the sake of parallel makes. -vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff +vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff dtrace_stuff @# We need a null action here, so implicit rules don't get consulted. $(Cached_plat): $(Plat_File) @@ -96,6 +96,15 @@ jvmti_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f jvmti.make $(MFLAGS-adjusted) +ifeq ($(OS_VENDOR), Darwin) +# generate dtrace header files +dtrace_stuff: $(Cached_plat) $(adjust-mflags) + @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED) +else +dtrace_stuff: + @# We need a null action here, so implicit rules don't get consulted. +endif + # generate SA jar files and native header sa_stuff: @$(MAKE) -f sa.make $(MFLAGS-adjusted)