8056053: Disable HOTSPOT_BUILD_JOBS when building with configure
authorerikj
Thu, 28 Aug 2014 11:58:49 +0200
changeset 26549 2346a9f0d29d
parent 26398 ca1f84f97e20
child 26550 a0cbe04837bf
8056053: Disable HOTSPOT_BUILD_JOBS when building with configure Reviewed-by: dholmes, ihse, dcubed
common/autoconf/hotspot-spec.gmk.in
make/HotspotWrapper.gmk
--- a/common/autoconf/hotspot-spec.gmk.in	Fri Sep 05 12:42:41 2014 +0200
+++ b/common/autoconf/hotspot-spec.gmk.in	Thu Aug 28 11:58:49 2014 +0200
@@ -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	Fri Sep 05 12:42:41 2014 +0200
+++ b/make/HotspotWrapper.gmk	Thu Aug 28 11:58:49 2014 +0200
@@ -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