commit 5e07dc70ddffc0597fab741ca1dfe83ce01630cf
author Mike Frysinger <vapier@chromium.org> Wed Nov 05 14:40:04 2014 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 14 07:41:57 2014 +0000
tree 5a2dced27e63a6101bc1f74dec083aeafee075ad
parent 1d36b95d5fb430c1f12461a4190a12e541f4aba5

make_chroot: drop cross-compiler install

Since our tooling can install the required toolchains on demand for a
board, there's no need for the initial sdk creation to install all of
them.

BUG=chromium:342199
TEST=`cbuildbot chromiumos-sdk` passes
TEST=created a new chroot, saw no cross-compilers, built x86-generic board,
     and saw the toolchain get installed
CQ-DEPEND=CL:227232, CL:228271, CL:227671

Change-Id: Ic91bf54ec73bdff8d5a501a5321a2418b5b5f97a
Reviewed-on: https://chromium-review.googlesource.com/227672
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index e277417..2aabcdb 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -455,7 +455,9 @@
 done
 
 info "Updating host toolchain"
-early_enter_chroot $EMERGE_CMD -uNv crossdev
+if [[ ! -e ${FLAGS_chroot}/usr/bin/crossdev ]]; then
+  early_enter_chroot $EMERGE_CMD -uNv crossdev
+fi
 TOOLCHAIN_ARGS=( --deleteold )
 if [[ ${FLAGS_usepkg} -eq ${FLAGS_FALSE} ]]; then
   TOOLCHAIN_ARGS+=( --nousepkg )
@@ -503,11 +505,6 @@
   CHROOT_EXAMPLE_OPT="--chroot=$FLAGS_chroot"
 fi
 
-# As a final pass, build all desired cross-toolchains.
-info "Updating toolchains"
-enter_chroot sudo -E "${CHROOT_TRUNK_DIR}/chromite/bin/cros_setup_toolchains" \
-    "${TOOLCHAIN_ARGS[@]}"
-
 command_completed
 
 cat <<EOF