From 150b11985a96c750d9071e850c79a4a8992267a0 Mon Sep 17 00:00:00 2001 From: Ahmad Sharif Date: Thu, 30 Jun 2011 16:04:21 -0700 Subject: [PATCH] Revert "Changed build_image to use toolchain_utils.sh to install gcc libs." This reverts commit f51b39a0e34f1140ba3ecd4e01d9ce91226054af. Change-Id: I0b05abd75765e146e3413f15ef1ee0c3f5f8b348 Reviewed-on: http://gerrit.chromium.org/gerrit/3514 Reviewed-by: David James Tested-by: asharif Reviewed-by: asharif --- build_image | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build_image b/build_image index 3408bd6f2f..237232fc77 100755 --- a/build_image +++ b/build_image @@ -679,11 +679,10 @@ create_base_image() { ./usr/lib/debug/usr/${CHOST} --strip-components=6 fi - . "${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 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" # 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