Changed build_image to use toolchain_utils.sh to install gcc libs.

toolchain_utils.sh contains the relevant function to switch cross-gcc's
and copy over the libraries.

BUG=none
TEST=./setup_board --board=x86-mario --nousepkg &&
./build_packages --board=x86-mario &&
./build_image --board=x86-mario &&
./mod_image_for_vm.sh --board=x86-mario &&
tested image on vm.
Also ran:
cbuildbot.py --buildroot=checkout --resume --noarchive --nosync
--nouprev --noprebuilts x86-generic-full and it passed.

Change-Id: Ic38752eaadbf4f033a9ec7ee288a560f24a6c0b2
Reviewed-on: http://gerrit.chromium.org/gerrit/3212
Reviewed-by: asharif <asharif@chromium.org>
Tested-by: asharif <asharif@chromium.org>
This commit is contained in:
Ahmad Sharif 2011-06-24 16:44:26 -07:00 committed by asharif
parent 39ba1e5891
commit f51b39a0e3

View File

@ -679,10 +679,11 @@ create_base_image() {
./usr/lib/debug/usr/${CHOST} --strip-components=6
fi
# We need to install libstdc++ manually from the cross toolchain.
# TODO: Figure out a better way of doing this?
sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
. "${SRC_ROOT}/platform/dev/toolchain_utils.sh"
board_ctarget=$(get_ctarget_from_board "${BOARD}")
for atom in $(portageq match / cross-$board_ctarget/gcc); do
copy_gcc_libs "${ROOT_FS_DIR}" $atom
done
# We "emerge --root=${ROOT_FS_DIR} --root-deps=rdeps --usepkgonly" all of the
# runtime packages for chrome os. This builds up a chrome os image from