Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(987)

Unified Diff: build_image

Issue 2914004: Use --fast by default in build_image when --jobs is enabled. (Closed) Base URL: ssh://git@chromiumos-git/crosutils.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | common.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_image
diff --git a/build_image b/build_image
index 9b94d99c5647889d739952f3e650b1a238e417a2..7b9abc7f187c1b1aa132fdc85f9d8b56705ea975 100755
--- a/build_image
+++ b/build_image
@@ -92,6 +92,11 @@ if [ "${FLAGS_rootfs_size}" -gt "${FLAGS_rootfs_partition_size}" ] ; then
exit 1
fi
+if [ ${FLAGS_jobs} -ne -1 ]; then
+ EMERGE_JOBS="--jobs=${FLAGS_jobs}"
+ FLAGS_fast=${FLAGS_TRUE}
+fi
+
EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
echo "Using alternate emerge"
@@ -161,10 +166,6 @@ if [[ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]] ; then
INSTALL_MASK="${INSTALL_MASK} ${FACTORY_INSTALL_MASK}"
fi
-if [[ ${FLAGS_jobs} -ne -1 ]]; then
- EMERGE_JOBS="--jobs=${FLAGS_jobs}"
-fi
-
# Figure out ARCH from the given toolchain.
# TODO: Move to common.sh as a function after scripts are switched over.
TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }')
« no previous file with comments | « no previous file | common.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698