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
diff --git a/setup_board b/setup_board
index a88cff2489..0082124dd6 100755
--- a/setup_board
+++ b/setup_board
@@ -259,12 +259,13 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
   if [[ "${FLAGS_jobs}" -ne -1 ]]; then
     EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
   fi
+  EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS}"
 
   if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}"  && \
         "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]
   then
     EMERGE_FLAGS+=" --usepkg --getbinpkg"
-    EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS} --usepkgonly"
+    EMERGE_TOOLCHAIN_FLAGS+=" --usepkgonly"
   else
     # When binary packages are disabled we need to make sure the cross
     # sysroot includes any build dependencies for the toolchain.