build-script: let distcc dictate parallelism

pyrtsa · Feb 23, 2016 · 887c3bb · 887c3bb
1 parent bf712c5
commit 887c3bb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -1062,19 +1062,21 @@ else
     )
 fi
 
+
+CMAKE_JOBS="${BUILD_JOBS}"
 if [[ "${DISTCC}" ]] ; then
-    BUILD_ARGS="${BUILD_ARGS} -j $(distcc -j)"
+    CMAKE_JOBS="$(distcc -j)"
 fi
 
 case "${CMAKE_GENERATOR}" in
     Ninja)
-        BUILD_ARGS="${BUILD_ARGS} -j${BUILD_JOBS}"
+        BUILD_ARGS="${BUILD_ARGS} -j${CMAKE_JOBS}"
         if [[ "${VERBOSE_BUILD}" ]] ; then
             BUILD_ARGS="${BUILD_ARGS} -v"
         fi
         ;;
     'Unix Makefiles')
-        BUILD_ARGS="${BUILD_ARGS} -j${BUILD_JOBS}"
+        BUILD_ARGS="${BUILD_ARGS} -j${CMAKE_JOBS}"
         if [[ "${VERBOSE_BUILD}" ]] ; then
             BUILD_ARGS="${BUILD_ARGS} VERBOSE=1"
         fi
@@ -1084,7 +1086,7 @@ case "${CMAKE_GENERATOR}" in
         # but since we're not using proper Xcode 4 schemes, this is the
         # only way to get target-level parallelism.
         BUILD_ARGS="${BUILD_ARGS} -parallelizeTargets"
-        BUILD_ARGS="${BUILD_ARGS} -jobs ${BUILD_JOBS}"
+        BUILD_ARGS="${BUILD_ARGS} -jobs ${CMAKE_JOBS}"
         BUILD_TARGET_FLAG="-target"
         COMMON_CMAKE_OPTIONS=(
             "${COMMON_CMAKE_OPTIONS[@]}"