From db0a3903d1be34f744e50a41c378b2db9d6ba22c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 1 Jun 2012 16:35:07 -0400 Subject: [PATCH] setup_board: switch over to cros_setup_toolchains for toolchain listing We want to centralize toolchain.conf parsing in cros_setup_toolchains. BUG=None TEST=`cbuildbot chromiumos-sdk` worked Change-Id: I650616725595388515c8b1acbf7479b9ddcdd44e Reviewed-on: https://gerrit.chromium.org/gerrit/24334 Reviewed-by: Zdenek Behan Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- setup_board | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup_board b/setup_board index 813a1a7ed7..0199a1502c 100755 --- a/setup_board +++ b/setup_board @@ -553,10 +553,8 @@ if ${HOST_BOARD}; then # The new chroot should have gcc for each target. Make sure that # the latest one is correctly selected. Ignore cat errors as not # all overlays will have a toolchain.conf. - ALL_OVERLAYS=$(cros_overlay_list --all_boards) - TARGETS=$(sed 's:#.*::' $(printf '%s/toolchain.conf ' ${ALL_OVERLAYS}) \ - 2>/dev/null | sort -u) - for target in ${TARGETS}; do + ALL_TARGETS=$(cros_setup_toolchains --show-board-cfg=all) + for target in ${ALL_TARGETS//,/ }; do libc=$(eval $(crossdev --show-target-cfg "${target}"); echo ${libc_pn}) if [[ ${libc} == "glibc" ]] ; then # Install needed glibc tarball.