Merge
authoramurillo
Tue, 16 Sep 2014 08:04:59 -0700
changeset 26552 340b7de20baa
parent 26548 3b002da2aee1 (current diff)
parent 26551 c85d3c64cb1e (diff)
child 26553 88e2791b0bc6
Merge
--- a/common/autoconf/hotspot-spec.gmk.in	Tue Sep 16 12:08:04 2014 +0200
+++ b/common/autoconf/hotspot-spec.gmk.in	Tue Sep 16 08:04:59 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@
 
--- a/make/HotspotWrapper.gmk	Tue Sep 16 12:08:04 2014 +0200
+++ b/make/HotspotWrapper.gmk	Tue Sep 16 08:04:59 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