--- a/make/Main.gmk Tue May 03 09:44:54 2016 -0700
+++ b/make/Main.gmk Thu May 05 12:35:48 2016 -0700
@@ -228,16 +228,12 @@
# Build hotspot target
ifeq ($(BUILD_HOTSPOT),true)
- hotspot:
- ifeq ($(USE_NEW_HOTSPOT_BUILD), true)
- +($(CD) $(HOTSPOT_TOPDIR)/makefiles && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk)
- else
- +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
- endif
+hotspot:
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk)
endif
hotspot-ide-project:
- +($(CD) $(HOTSPOT_TOPDIR)/makefiles && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
ALL_TARGETS += hotspot hotspot-ide-project