OpenJDK / amber / amber
changeset 26550:a0cbe04837bf
Merge
| author | amurillo |
|---|---|
| date | Fri, 12 Sep 2014 13:59:08 -0700 |
| parents | 9d0e6639a4d7 2346a9f0d29d |
| children | c85d3c64cb1e |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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@
--- 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