Merge pull request #114 from oneton/1.0.2-parallel

Parallel build (make -j)
This commit is contained in:
Felix Schulze 2016-09-18 12:53:51 +02:00 committed by GitHub
commit 7f0df77c75
1 changed files with 11 additions and 2 deletions

View File

@ -32,6 +32,9 @@ CURL_OPTIONS="" #
# Please note: The framework will contain include files from the architecture listed first # Please note: The framework will contain include files from the architecture listed first
ARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64" ARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64"
# Set to false to disable make with multiple parallel jobs
PARALLEL="true"
# To set "enable-ec_nistp_64_gcc_128" configuration for x64 archs set next variable to "true" # To set "enable-ec_nistp_64_gcc_128" configuration for x64 archs set next variable to "true"
ENABLE_EC_NISTP_64_GCC_128="" # ENABLE_EC_NISTP_64_GCC_128="" #
# # # #
@ -87,6 +90,12 @@ IOS_MIN_SDK_VERSION="7.0"
TVOS_MIN_SDK_VERSION="9.0" TVOS_MIN_SDK_VERSION="9.0"
LOG_VERBOSE="$1" # Options: verbose (full output) or verbose-on-error (echo last 500 logged lines when error occurs) LOG_VERBOSE="$1" # Options: verbose (full output) or verbose-on-error (echo last 500 logged lines when error occurs)
# Determine number of cores for (parallel) build
BUILD_THREADS=1
if [ "${PARALLEL}" != "false" ]; then
BUILD_THREADS=$(sysctl hw.ncpu | awk '{print $2}')
fi
if [ ! -d "$DEVELOPER" ]; then if [ ! -d "$DEVELOPER" ]; then
echo "xcode path is not set correctly $DEVELOPER does not exist" echo "xcode path is not set correctly $DEVELOPER does not exist"
echo "run" echo "run"
@ -249,9 +258,9 @@ do
# Run make # Run make
echo " Make...\c" echo " Make...\c"
if [ "${LOG_VERBOSE}" == "verbose" ]; then if [ "${LOG_VERBOSE}" == "verbose" ]; then
make | tee -a "${LOG}" make -j "${BUILD_THREADS}" | tee -a "${LOG}"
else else
(make >> "${LOG}" 2>&1) & spinner (make -j "${BUILD_THREADS}" >> "${LOG}" 2>&1) & spinner
fi fi
# Check for error status # Check for error status