From 846c8c2ee1c3f98e22f5a7eb0d0d6b30d4ea4917 Mon Sep 17 00:00:00 2001
From: "C.Lee Taylor" <leet@tari.com>
Date: Tue, 23 Aug 2022 15:26:21 +0200
Subject: [PATCH 1/2] Switch linux-arm64 build to cross for GHA binaries build

---
 .github/workflows/base_node_binaries.json |  3 ++-
 Cross.toml                                | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/base_node_binaries.json b/.github/workflows/base_node_binaries.json
index c8d1ecf817..68641b7952 100644
--- a/.github/workflows/base_node_binaries.json
+++ b/.github/workflows/base_node_binaries.json
@@ -13,7 +13,8 @@
     "runs-on": "ubuntu-latest",
     "rust": "stable",
     "target": "aarch64-unknown-linux-gnu",
-    "cross": false,
+    "cross": true,
+    "target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
     "target_cpu": "generic",
     "features": "safe"
   },
diff --git a/Cross.toml b/Cross.toml
index 8f7c328596..3104cfbd71 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -6,3 +6,24 @@ passthrough = ["CFLAGS"]
 
 [target.arm-linux-androideabi.env]
 passthrough = ["CFLAGS"]
+
+[target.aarch64-unknown-linux-gnu]
+image = "ubuntu:18.04"
+pre-build = [
+  "apt-get update && apt-get install --assume-yes cmake gcc clang-10 pkg-config-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && alias pkg-config=aarch64-linux-gnu-pkg-config"
+]
+
+[target.aarch64-unknown-linux-gnu.env]
+passthrough = [
+  "RUST_DEBUG",
+  "RUSTFLAGS",
+  "ARCH",
+  "FEATURES",
+  "ROARING_ARCH",
+  "BUILD_TARGET=aarch64-unknown-linux-gnu/",
+  "RUST_TARGET=--target=aarch64-unknown-linux-gnu",
+  "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc",
+  "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc",
+  "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++",
+  "BINDGEN_EXTRA_CLANG_ARGS=--sysroot /usr/aarch64-linux-gnu/include/",
+]

From f41fdd574dc81263d5ef67e9368fe6cbfd392503 Mon Sep 17 00:00:00 2001
From: "C.Lee Taylor" <leet@tari.com>
Date: Tue, 23 Aug 2022 15:39:27 +0200
Subject: [PATCH 2/2] Remove older arm64 hack for cross-rs compile

---
 .github/workflows/base_node_binaries.yml | 27 +++---------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
index 3e497bb099..7904f73ae4 100644
--- a/.github/workflows/base_node_binaries.yml
+++ b/.github/workflows/base_node_binaries.yml
@@ -108,7 +108,7 @@ jobs:
           override: true
 
       - name: Install Linux dependencies - Ubuntu
-        if: startsWith(runner.os,'Linux')
+        if: ${{ startsWith(runner.os,'Linux') && matrix.builds.name != 'linux-arm64' }}
         run: |
           sudo apt-get update
           sudo apt-get -y install \
@@ -125,11 +125,7 @@ jobs:
             protobuf-compiler \
             libncurses5-dev \
             libncursesw5-dev \
-            zip \
-            gcc-aarch64-linux-gnu \
-            g++-aarch64-linux-gnu
-          sudo apt-get -y --purge remove \
-            clang-9 clang-format-9 libclang-common-9-dev libclang-cpp9 libclang1-9
+            zip
 
       - name: Install macOS dependencies
         if: startsWith(runner.os,'macOS')
@@ -182,25 +178,8 @@ jobs:
       - name: Cache cargo files and outputs
         uses: Swatinem/rust-cache@v1
 
-        # Fix me soon!
-      - name: Build rust binaries - hardcoded (linux-arm64)
-        if: ${{ matrix.builds.name == 'linux-arm64' }}
-        shell: bash
-        run: |
-          export RUSTFLAGS="-C target_cpu=generic"
-          export ROARING_ARCH=generic
-          export BUILD_TARGET="aarch64-unknown-linux-gnu/"
-          export RUST_TARGET="--target=aarch64-unknown-linux-gnu"
-          export ARCH=generic
-          export FEATURES=safe
-          export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
-          export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
-          export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
-          export BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/aarch64-linux-gnu/include/"
-          cargo build --release --target ${{ matrix.builds.target }} --features ${{ matrix.builds.features }} ${{ matrix.builds.target_bins }}
-
       - name: Build rust binaries - Normal
-        if: ${{ matrix.builds.name != 'linux-arm64' }}
+        #if: ${{ matrix.builds.name != 'linux-arm64' }}
         uses: actions-rs/cargo@v1
         env:
           RUSTFLAGS: "-C target_cpu=${{ matrix.builds.target_cpu }}"