Mercurial > hg > release > icedtea7-forest-2.5
changeset 896:a9b1de9ac332
Propagate HOTSPOT_BUILD_JOBS and PARALLEL_COMPILE_JOBS from the top-level make to the corresponding sub-makes.
- Propagate HOTSPOT_BUILD_JOBS to the HotSpot make. Alternatively use the value of PARALLEL_COMPILE_JOBS if available and HOTSPOT_BUILD_JOBS was not defined.
- Propagate PARALLEL_COMPILE_JOBS to the JDK make.
| author | simonis |
|---|---|
| date | Wed, 24 Oct 2012 18:59:08 +0200 |
| parents | e0dcb402d603 |
| children | 44639bf80d87 |
| files | make/hotspot-rules.gmk make/jdk-rules.gmk |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot-rules.gmk Thu Jul 26 18:01:39 2012 +0200 +++ b/make/hotspot-rules.gmk Wed Oct 24 18:59:08 2012 +0200 @@ -105,6 +105,16 @@ HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) endif +# Propagate HOTSPOT_BUILD_JOBS to the HotSpot make. Alternatively use the value +# of PARALLEL_COMPILE_JOBS if available and HOTSPOT_BUILD_JOBS was not defined. +ifdef HOTSPOT_BUILD_JOBS + HOTSPOT_BUILD_ARGUMENTS += HOTSPOT_BUILD_JOBS=$(HOTSPOT_BUILD_JOBS) +else + ifdef PARALLEL_COMPILE_JOBS + HOTSPOT_BUILD_ARGUMENTS += HOTSPOT_BUILD_JOBS=$(PARALLEL_COMPILE_JOBS) + endif +endif + ifdef ZIP_DEBUGINFO_FILES HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" endif
--- a/make/jdk-rules.gmk Thu Jul 26 18:01:39 2012 +0200 +++ b/make/jdk-rules.gmk Wed Oct 24 18:59:08 2012 +0200 @@ -80,6 +80,10 @@ JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" endif +# Propagate PARALLEL_COMPILE_JOBS to the JDK make +ifdef PARALLEL_COMPILE_JOBS + JDK_BUILD_ARGUMENTS += PARALLEL_COMPILE_JOBS=$(PARALLEL_COMPILE_JOBS) +endif $(JDK_JAVA_EXE):: jdk-build