diff -r 8a3fe0ae06a8 -r e64f2cb57d05 common/makefiles/HotspotWrapper.gmk
--- a/common/makefiles/HotspotWrapper.gmk	Wed Oct 24 13:11:42 2012 -0700
+++ b/common/makefiles/HotspotWrapper.gmk	Fri Oct 26 14:29:57 2012 -0700
@@ -36,9 +36,12 @@
 default: all
 
 # Get all files except .hg in the hotspot directory.
-HOTSPOT_FILES :=  $(shell $(FIND) $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
+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) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
 	$(TOUCH) $@