diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2010-09-26 18:40:45 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2010-09-26 18:40:45 +0000 |
| commit | 04143d208771f7662ac899644bdc506241f1e082 (patch) | |
| tree | 0ffea8df5fc74cfee2b6b43acc686f63fc27b983 /java | |
| parent | - fix crash on png files (diff) | |
. Respect MAKE_JOB_NUMBERS and use that to set up the number of HotSpot
make jobs. If not, fall back to the number of CPUs.
Only the HotSpot part of the build is safe to parallelise, so mark the
port as MAKE_JOBS_UNSAFE.
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk16/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 1892d37b1676..d29463cdb3c7 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -42,6 +42,7 @@ SUB_LIST+= JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \ WRKSRC= ${WRKDIR}/control/make USE_ZIP= YES +MAKE_JOBS_UNSAFE= yes JRL_SRCFILE= jdk-${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar JRL_BINFILE= jdk-${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar @@ -144,12 +145,13 @@ MAKE_ENV+= SKIP_DEBUG_BUILD="false" MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif -.if defined(HOTSPOT_BUILD_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS="${HOTSPOT_BUILD_JOBS}" +.if !defined(DISABLE_MAKE_JOBS) +.if defined(MAKE_JOBS_NUMBER) +BUILD_JOBS_NUMBER= ${MAKE_JOBS_NUMBER} +.else +BUILD_JOBS_NUMBER= `${SYSCTL} -n kern.smp.cpus` .endif - -.if defined(PARALLEL_BUILD_JOBS) -MAKE_ENV+= ALT_PARALLEL_BUILD_JOBS="${PARALLEL_BUILD_JOBS}" +MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER} .endif ALL_TARGET= all |