From c8197ab8a440808819133167833f6ccc77c797cd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Apr 2023 16:16:07 +0100
Subject: [PATCH] Move dockerbuild aarch64 tweaks

---
 .github/workflows/build_linux.yaml           | 15 ++-------------
 dockerbuild/{ => aarch64}/.cargo/config.toml |  0
 dockerbuild/aarch64/.env                     | 11 +++++++++++
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename dockerbuild/{ => aarch64}/.cargo/config.toml (100%)
 create mode 100644 dockerbuild/aarch64/.env

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
index 06de445..78a0be1 100644
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -90,19 +90,8 @@ jobs:
                   apt-get -qq update
                   apt-get -qq install --no-install-recommends crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64 libgnome-keyring-dev:arm64
                   rustup target add aarch64-unknown-linux-gnu
-                  mv dockerbuild/.cargo .
-
-                  echo "AS=/usr/bin/aarch64-linux-gnu-as" >> $GITHUB_ENV
-                  echo "STRIP=/usr/bin/aarch64-linux-gnu-strip" >> $GITHUB_ENV
-                  echo "AR=/usr/bin/aarch64-linux-gnu-ar" >> $GITHUB_ENV
-                  echo "CC=/usr/bin/aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-                  echo "CPP=/usr/bin/aarch64-linux-gnu-cpp" >> $GITHUB_ENV
-                  echo "CXX=/usr/bin/aarch64-linux-gnu-g++" >> $GITHUB_ENV
-                  echo "LD=/usr/bin/aarch64-linux-gnu-ld" >> $GITHUB_ENV
-                  echo "FC=/usr/bin/aarch64-linux-gnu-gfortran" >> $GITHUB_ENV
-                  echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV
-                  echo "CFLAGS=-L/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV
-                  echo "RUSTFLAGS=-L/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV
+                  mv dockerbuild/aarch64/.cargo .
+                  cat dockerbuild/aarch64/.env >> $GITHUB_ENV
 
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
diff --git a/dockerbuild/.cargo/config.toml b/dockerbuild/aarch64/.cargo/config.toml
similarity index 100%
rename from dockerbuild/.cargo/config.toml
rename to dockerbuild/aarch64/.cargo/config.toml
diff --git a/dockerbuild/aarch64/.env b/dockerbuild/aarch64/.env
new file mode 100644
index 0000000..1e7b603
--- /dev/null
+++ b/dockerbuild/aarch64/.env
@@ -0,0 +1,11 @@
+AS=/usr/bin/aarch64-linux-gnu-as
+STRIP=/usr/bin/aarch64-linux-gnu-strip
+AR=/usr/bin/aarch64-linux-gnu-ar
+CC=/usr/bin/aarch64-linux-gnu-gcc
+CPP=/usr/bin/aarch64-linux-gnu-cpp
+CXX=/usr/bin/aarch64-linux-gnu-g++
+LD=/usr/bin/aarch64-linux-gnu-ld
+FC=/usr/bin/aarch64-linux-gnu-gfortran
+PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+CFLAGS=-L/usr/lib/aarch64-linux-gnu
+RUSTFLAGS=-L/usr/lib/aarch64-linux-gnu