Fix openocd and risc-v install dir names

Author: will-v-pi

build_macos.sh

@@ -113,7 +113,7 @@ if [[ "$SKIP_OPENOCD" != 1 ]]; then
     echo "Packaging OpenOCD"
     # Package OpenOCD separately as well
 
-    version=($("./$builddir/openocd-install/usr/local/bin/openocd" --version 2>&1))
+    version=($("./$builddir/openocd-install-$(uname -m)/usr/local/bin/openocd" --version 2>&1))
     version=${version[0]}
     version=${version[3]}
     version=$(echo $version | cut -d "-" -f 1)
@@ -123,22 +123,22 @@ if [[ "$SKIP_OPENOCD" != 1 ]]; then
     filename="openocd-${version}-$(uname -m)-${suffix}.zip"
 
     echo "Saving OpenOCD package to $filename"
-    pushd "$builddir/openocd-install/usr/local/bin"
+    pushd "$builddir/openocd-install-$(uname -m)/usr/local/bin"
     tar -a -cf "$topd/bin/$filename" * -C "../share/openocd" "scripts"
     popd
 fi
 
 if [[ "$SKIP_RISCV" != 1 ]]; then
     echo "Packaging RISC-V Toolchain"
     # Package riscv toolchain separately as well
-    version=$("./$builddir/riscv-install/bin/riscv32-unknown-elf-gcc" -dumpversion)
+    version=$("./$builddir/riscv-install-$(uname -m)/bin/riscv32-unknown-elf-gcc" -dumpversion)
     version=$(echo $version | cut -d "." -f 1)
     echo "Risc-V Toolchain version $version"
 
     filename="riscv-toolchain-${version}-$(uname -m)-${suffix}.zip"
 
     echo "Saving RISC-V Toolchain package to $filename"
-    pushd "$builddir/riscv-install/"
+    pushd "$builddir/riscv-install-$(uname -m)/"
     tar -a -cf "$topd/bin/$filename" *
     popd
 fi