ref: c0e2b5f473b3f87f18dacbddb3adf733ca7f9b22
parent: 7d28d12ef34f6cbb6b1e18f3b23b71392fd3ddf5
parent: c6a419b490e7fed95e11caffd52ce37b9ded6218
author: Tom Finegan <[email protected]>
date: Tue Sep 29 13:08:55 EDT 2015
Merge "build/make/iosbuild.sh: Remove jobs argument."
--- a/build/make/iosbuild.sh
+++ b/build/make/iosbuild.sh
@@ -25,7 +25,6 @@
DIST_DIR="_dist"
FRAMEWORK_DIR="VPX.framework"
HEADER_DIR="${FRAMEWORK_DIR}/Headers/vpx"-MAKE_JOBS=1
SCRIPT_DIR=$(dirname "$0")
LIBVPX_SOURCE_DIR=$(cd ${SCRIPT_DIR}/../..; pwd) LIPO=$(xcrun -sdk iphoneos${SDK} -find lipo)@@ -58,7 +57,7 @@
${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS} ${target_specific_flags} \ ${devnull}export DIST_DIR
- eval make -j ${MAKE_JOBS} dist ${devnull}+ eval make dist ${devnull} cd "${old_pwd}" vlog "***Done building target: ${target}***"@@ -203,7 +202,6 @@
Usage: ${0##*/} [arguments]--help: Display this message and exit.
--extra-configure-args <args>: Extra args to pass when configuring libvpx.
- --jobs: Number of make jobs.
--preserve-build-output: Do not delete the build directory.
--show-build-output: Show output from each library build.
--targets <targets>: Override default target list. Defaults:
@@ -238,10 +236,6 @@
iosbuild_usage
exit
;;
- --jobs)
- MAKE_JOBS="$2"
- shift
- ;;
--preserve-build-output)
PRESERVE_BUILD_OUTPUT=yes
;;
@@ -274,11 +268,11 @@
EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS} FRAMEWORK_DIR=${FRAMEWORK_DIR} HEADER_DIR=${HEADER_DIR}- MAKE_JOBS=${MAKE_JOBS}- PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT} LIBVPX_SOURCE_DIR=${LIBVPX_SOURCE_DIR} LIPO=${LIPO}+ MAKEFLAGS=${MAKEFLAGS} ORIG_PWD=${ORIG_PWD}+ PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT} TARGETS="${TARGETS}"EOF
fi