ci: fix arm64 linker errors

dashpay · Mar 15, 2022 · b954e50 · b954e50
2 parents 1b40ae1 + 543d611
commit b954e50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,3 +3,6 @@ rustflags = [ "-C", "target-feature=-crt-static" ]
 
 [target.x86_64-unknown-linux-musl]
 rustflags = [ "-C", "target-feature=-crt-static" ]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,12 +24,11 @@ jobs:
             node_arch: x64
             compiler: musl
             platform: unknown-linux
-          # Disabled since there are issues with linker
-          # - os: ubuntu-latest
-          #   arch: aarch64
-          #   node_arch: arm64
-          #   compiler: gnu
-          #   platform: unknown-linux
+          - os: ubuntu-latest
+            arch: aarch64
+            node_arch: arm64
+            compiler: gnu
+            platform: unknown-linux
           - os: ubuntu-latest
             arch: aarch64
             node_arch: arm64

diff --git a/node/docker/build.sh b/node/docker/build.sh
@@ -13,6 +13,10 @@ done
 ## Install multilib
 apt update
 apt install -y gcc-multilib
+if [[ $target = "aarch64-unknown-linux-gnu" ]]
+then
+    apt install -y gcc-aarch64-linux-gnu libstdc++-9-dev-arm64-cross
+fi
 
 ## Install Node.JS
 curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -