Commit 2be2c7d4 authored by Tom Finegan's avatar Tom Finegan Committed by Gerrit Code Review
Browse files

Merge "build/make/iosbuild.sh: Support extra configure args."

Showing with 6 additions and 1 deletion
...@@ -43,7 +43,7 @@ build_target() { ...@@ -43,7 +43,7 @@ build_target() {
mkdir "${target}" mkdir "${target}"
cd "${target}" cd "${target}"
eval "../../${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \ eval "../../${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \
--disable-docs ${devnull} --disable-docs ${EXTRA_CONFIGURE_ARGS} ${devnull}
export DIST_DIR export DIST_DIR
eval make -j ${MAKE_JOBS} dist ${devnull} eval make -j ${MAKE_JOBS} dist ${devnull}
cd "${old_pwd}" cd "${old_pwd}"
...@@ -206,6 +206,10 @@ trap cleanup EXIT ...@@ -206,6 +206,10 @@ trap cleanup EXIT
# Parse the command line. # Parse the command line.
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
--extra-configure-args)
EXTRA_CONFIGURE_ARGS="$2"
shift
;;
--help) --help)
iosbuild_usage iosbuild_usage
exit exit
...@@ -235,6 +239,7 @@ if [ "${VERBOSE}" = "yes" ]; then ...@@ -235,6 +239,7 @@ if [ "${VERBOSE}" = "yes" ]; then
cat << EOF cat << EOF
BUILD_ROOT=${BUILD_ROOT} BUILD_ROOT=${BUILD_ROOT}
DIST_DIR=${DIST_DIR} DIST_DIR=${DIST_DIR}
EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS}
FRAMEWORK_DIR=${FRAMEWORK_DIR} FRAMEWORK_DIR=${FRAMEWORK_DIR}
HEADER_DIR=${HEADER_DIR} HEADER_DIR=${HEADER_DIR}
MAKE_JOBS=${MAKE_JOBS} MAKE_JOBS=${MAKE_JOBS}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment