make/HotspotWrapper.gmk

*** 33,50 ****
  # affected, however. This is required for correct dependency management.
  .NOTPARALLEL:
  
  default: all
  
! # Get all files except .hg in the hotspot directory.
! HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
  
  # The old build creates hotspot output dir before calling hotspot and
  # not doing it breaks builds on msys.
  $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
          @$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
!         @($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(HOTSPOT_MAKE_ARGS) LOG_LEVEL=$(LOG_LEVEL) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
          $(TOUCH) $@
  
  hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
  
  all: hotspot
--- 33,54 ----
  # affected, however. This is required for correct dependency management.
  .NOTPARALLEL:
  
  default: all
  
! # Get all files in src, make or agent subdirs in hotspot directory and
! # filter out .hg. This skips the test directory.
! HOTSPOT_FILES := $(shell $(FIND) -L \
!     $(HOTSPOT_TOPDIR)/src $(HOTSPOT_TOPDIR)/make $(HOTSPOT_TOPDIR)/agent \
!     -name ".hg" -prune -o -print)
  
  # The old build creates hotspot output dir before calling hotspot and
  # not doing it breaks builds on msys.
  $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
          @$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
!         @($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(HOTSPOT_MAKE_ARGS) \
!             LOG_LEVEL=$(LOG_LEVEL) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
          $(TOUCH) $@
  
  hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
  
  all: hotspot