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

BUG=none
TEST=buildbot.py arm-generic-full
buildbot.py x86-generic-full

Change-Id: I6cdc22d50422afb721ce0d743c8a80398719f9b4
Reviewed-on: http://gerrit.chromium.org/gerrit/3556
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: asharif <asharif@chromium.org>
Tested-by: asharif <asharif@chromium.org>
This commit is contained in:
Ahmad Sharif 2011-06-30 19:51:37 -07:00 committed by asharif
parent bc2f4bfbf9
commit 8c86db51d7

View File

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