diff --git a/build_library/catalyst_toolchains.sh b/build_library/catalyst_toolchains.sh
index 066b599cd1..1e0ea642f5 100644
--- a/build_library/catalyst_toolchains.sh
+++ b/build_library/catalyst_toolchains.sh
@@ -47,7 +47,7 @@ EOF
 
 build_cross_toolchain() {
     local cross_chost="$1"
-    local cross_pkgs=( "${TOOLCHAIN_PKGS[@]/*\//cross-${cross_chost}/}" )
+    local cross_pkgs=( $(get_cross_pkgs $cross_chost) )
     local PORTDIR="$(portageq envvar PORTDIR)"
     local PKGDIR="${PORTDIR}/packages/crossdev"
 
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index c8156433ff..f51e8d16ac 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -62,3 +62,12 @@ get_board_profile() {
         fi
     done
 }
+
+get_cross_pkgs() {
+    local cross_chost native_pkg
+    for cross_chost in "$@"; do
+        for native_pkg in "${TOOLCHAIN_PKGS[@]}"; do
+            echo "${native_pkg/*\//cross-${cross_chost}/}"
+        done
+    done
+}