# HG changeset patch
# User amurillo
# Date 1410555548 25200
# Node ID a0cbe04837bf7a86ab470acfc23fd923a54c265a
# Parent  9d0e6639a4d71b63507dd94b1a028e963b27e798# Parent  2346a9f0d29de6860d988bace99a7e25b2117719
Merge

diff -r 9d0e6639a4d7 -r a0cbe04837bf common/autoconf/hotspot-spec.gmk.in
--- a/common/autoconf/hotspot-spec.gmk.in	Wed Jul 05 20:01:04 2017 +0200
+++ b/common/autoconf/hotspot-spec.gmk.in	Fri Sep 12 13:59:08 2014 -0700
@@ -97,8 +97,6 @@
 endif
 
 HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
-# This is used from the libjvm build for C/C++ code.
-HOTSPOT_BUILD_JOBS:=$(JOBS)
 # Control wether Hotspot runs Queens test after building
 TEST_IN_BUILD=@TEST_IN_BUILD@
 
diff -r 9d0e6639a4d7 -r a0cbe04837bf make/HotspotWrapper.gmk
--- a/make/HotspotWrapper.gmk	Wed Jul 05 20:01:04 2017 +0200
+++ b/make/HotspotWrapper.gmk	Fri Sep 12 13:59:08 2014 -0700
@@ -42,7 +42,7 @@
 # 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))
+	@($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
 	$(TOUCH) $@
 
 hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp