From c2f908a143634d4e372833d25dfa75db0681ad7f Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Sun, 18 Jul 2021 19:56:17 +0300
Subject: [PATCH] Add toolchain name for multitool archives

---
 efibuild.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/efibuild.sh b/efibuild.sh
index a6d2a50..580fdcc 100755
--- a/efibuild.sh
+++ b/efibuild.sh
@@ -452,12 +452,19 @@ if [ "$(type -t package)" = "function" ]; then
       rm -f Binaries/*.zip
     fi
     for rtarget in "${RTARGETS[@]}" ; do
-      if [ "$PACKAGE" = "" ] || [ "$PACKAGE" = "$rtarget" ]; then
-        package "UDK/Build/${RELPKG}/${rtarget}_${TOOLCHAINS[0]}/${ARCHS[0]}" "$rtarget" "$HASH" || exit 1
-        if [ "$NO_ARCHIVES" != "1" ]; then
-          cp "UDK/Build/${RELPKG}/${rtarget}_${TOOLCHAINS[0]}/${ARCHS[0]}"/*.zip Binaries || echo skipping
+      for toolchain in "${TOOLCHAINS[@]}" ; do
+        if [ "$PACKAGE" = "" ] || [ "$PACKAGE" = "$rtarget" ]; then
+          if [ "${#TOOLCHAINS[@]}" -eq 1 ]; then
+            name="${rtarget}"
+          else
+            name="${toolchain}_${rtarget}"
+          fi
+          package "UDK/Build/${RELPKG}/${rtarget}_${toolchain}/${ARCHS[0]}" "${name}" "${HASH}" || exit 1
+          if [ "$NO_ARCHIVES" != "1" ]; then
+            cp "UDK/Build/${RELPKG}/${rtarget}_${toolchain}/${ARCHS[0]}"/*.zip Binaries || echo skipping
+          fi
         fi
-      fi
+      done
     done
   fi
 fi