From: Tom Finegan Date: Fri, 25 Sep 2015 22:18:17 +0000 (-0700) Subject: build/make/iosbuild.sh: Remove jobs argument. X-Git-Tag: v1.5.0~106^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6a419b490e7fed95e11caffd52ce37b9ded6218;p=platform%2Fupstream%2Flibvpx.git build/make/iosbuild.sh: Remove jobs argument. This can be handled via MAKEFLAGS. Change-Id: I3a58a8a41f6570cb3b80c7c97e51735b82bf4ec9 --- diff --git a/build/make/iosbuild.sh b/build/make/iosbuild.sh index 927f3e5..6f7180d 100755 --- a/build/make/iosbuild.sh +++ b/build/make/iosbuild.sh @@ -25,7 +25,6 @@ CONFIGURE_ARGS="--disable-docs 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 @@ build_target() { ${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 @@ cat << EOF Usage: ${0##*/} [arguments] --help: Display this message and exit. --extra-configure-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 : Override default target list. Defaults: @@ -238,10 +236,6 @@ while [ -n "$1" ]; do iosbuild_usage exit ;; - --jobs) - MAKE_JOBS="$2" - shift - ;; --preserve-build-output) PRESERVE_BUILD_OUTPUT=yes ;; @@ -274,11 +268,11 @@ cat << EOF 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