commit 5844be80cc5796b387b13ccb9f384920c32479ff
author Cody Northrop <cnorthrop@google.com> Fri Dec 02 09:28:42 2016 -0700
committer Cody Northrop <cnorthrop@google.com> Fri Dec 02 11:33:24 2016 -0700
tree 014db208c3ab435716389118c438cc2040312086
parent 69ea6d01986eecb286b61e81f8ddb81ae56aaece

toolchain: Fix core count in script for macOS

This could also switch to using gnproc from brew if needed in the future.

update_external_sources.sh

diff --git a/update_external_sources.sh b/update_external_sources.sh
index 9db212f..3c4df78 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -5,10 +5,13 @@
 
 if [[ $(uname) == "Linux" ]]; then
     CURRENT_DIR="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+    CORE_COUNT=$(nproc || echo 4)
 elif [[ $(uname) == "Darwin" ]]; then
     # Get greadlink with "brew install coreutils"
     CURRENT_DIR="$(dirname "$(greadlink -f ${BASH_SOURCE[0]})")"
+    CORE_COUNT=$(sysctl -n hw.ncpu || echo 4)
 fi
+echo CORE_COUNT=$CORE_COUNT
 
 REVISION_DIR="$CURRENT_DIR/external_revisions"
 
@@ -73,7 +76,7 @@
    mkdir -p build
    cd build
    cmake -D CMAKE_BUILD_TYPE=Release ..
-   make -j $(nproc)
+   make -j $CORE_COUNT
    make install
 }
 
@@ -83,7 +86,7 @@
    mkdir -p build
    cd build
    cmake -D CMAKE_BUILD_TYPE=Release ..
-   make -j $(nproc)
+   make -j $CORE_COUNT
 }
 
 # If any options are provided, just compile those tools