From 859cea030674b74fdd4b8dfda11d4a6305b1bfaa Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 20 Jul 2014 19:38:45 -0700
Subject: [PATCH] build_library: fix compatibility with latest crossdev version

---
 build_library/toolchain_util.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index 9abd281e1c..d8024a4a84 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -290,6 +290,10 @@ install_cross_libs() {
         "$ROOT/etc/portage/cross-${cross_chost}-depends")
 
     # Add toolchain to packages.provided since they are on the host system
+    if [[ -f "${package_provided}" ]]; then
+        # emerge-wrapper is trying a similar trick but doesn't work
+        $sudo rm -f "${package_provided}"
+    fi
     $sudo mkdir -p "${package_provided}"
     local native_pkg cross_pkg cross_pkg_version
     for native_pkg in "${TOOLCHAIN_PKGS[@]}"; do