commit 1dc0dfcc07883248a42c6286f46880b17d308728
author Caroline Tice <cmtice@chromium.org> Fri Aug 30 10:14:39 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 11 22:41:10 2013 +0000
tree 31e9c8f02d6652bf89cac8c346c360ec5f070b75
parent 1347e71986f9806e33a49a1f87f1f86b280536ad

Delete copy_gcc_libs for per-board library build.

As part of the probject to build compiler libraries on a per-board
rather than a per-architecture basis, the libraries are put directly in
the /build/<board> tree and the copy_gcc_libs function is no longer
needed.

BUG=chromium:197654
TEST=Successfully built the compiler and the libraries separately, with
their separate ebuild files. Successfully built and tested (with the
three CLs) on trybots for x86-alex-full, lumpy-full and daisy-full.
Re-uploading for repository upgrade.

CQ-DEPEND=CL:60303
CQ-DEPEND=CL:60350

Change-Id: Id6c37f117cba31a117e9c2df87c91b9d1740ddd8
Reviewed-on: https://chromium-review.googlesource.com/60289
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Commit-Queue: Caroline Tice <cmtice@chromium.org>

toolchain_utils.sh

diff --git a/toolchain_utils.sh b/toolchain_utils.sh
index f4a368d..4e94ba5 100755
--- a/toolchain_utils.sh
+++ b/toolchain_utils.sh
@@ -59,45 +59,6 @@
   echo "$atom" | sed -E 's|cross-([^/]+)/.*|\1|g'
 }
 
-copy_gcc_libs_helper()
-{
-  local target_location="$1"
-  local file_path="$2"
-  local dir_path=$(dirname "$file_path")
-  info "Copying $file_path symlink and file to $target_location/$dir_path/."
-  sudo mkdir -p "$target_location/$dir_path"
-  sudo cp -a "$file_path"* "$target_location/$dir_path/"
-  local env_d_file="$target_location/etc/env.d/05gcc"
-  info "Adding $dir_path to LDPATH in file $env_d_file"
-  sudo mkdir -p $(dirname "$env_d_file")
-  local line_to_add="LDPATH=\"$dir_path\""
-  if ! grep -q "^$line_to_add$" "$env_d_file" &>/dev/null
-  then
-    echo "$line_to_add" | sudo_append "$env_d_file"
-  fi
-}
-
-copy_gcc_libs()
-{
-  # TODO: Figure out a better way of doing this?
-  local target_location="$1"
-  local atom="$2"
-  local libgcc_file=$(portageq contents / $atom | \
-                      grep /libgcc_s.so$)
-  local libstdcxx_file=$(portageq contents / $atom | \
-                         grep /libstdc++.so$)
-  if [[ -z "$libgcc_file" || -z "$libstdcxx_file" ]]
-  then
-    error "Could not find libgcc_s.so/libstdcxx_s.so. Is\
-          =$atom emerged properly?"
-    return 1
-  fi
-  copy_gcc_libs_helper $target_location $libgcc_file
-  copy_gcc_libs_helper $target_location $libstdcxx_file
-  sudo ROOT="$target_location" env-update
-  return 0
-}
-
 get_current_binutils_config()
 {
   local ctarget="$1"
@@ -183,7 +144,6 @@
   local board
   for board in $boards
   do
-    cros_install_libs_for_config "$board" "$1"
     emerge-"$board" --oneshot sys-devel/libtool
   done
 }
@@ -210,10 +170,3 @@
     fi
   done
 }
-
-cros_install_libs_for_config()
-{
-  local board="$1"
-  local atom=$(get_installed_atom_from_config "$2")
-  copy_gcc_libs /build/"$board" "$atom"
-}