From 0e8e4f10833aa4ee7104a599e5fe56f2fa027a9b Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 23 Jan 2024 11:49:52 -0800
Subject: [PATCH] add static cross to aarch64-unknown-linux-musl

---
 .gitlab-ci.yml      | 13 +++++++++++++
 flake.nix           | 19 +++++++++++++++++++
 rust-toolchain.toml |  1 +
 3 files changed, 33 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95953e20..6695e431 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,19 @@ static:x86_64-unknown-linux-musl:
     paths:
       - conduit
 
+static:aarch64-unknown-linux-musl:
+  stage: artifacts
+  image: nixos/nix:2.19.2
+  script:
+    # Push artifacts and build requirements to binary cache
+    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
+
+    # Make the output less difficult to find
+    - cp result/bin/conduit conduit
+  artifacts:
+    paths:
+      - conduit
+
 oci-image:x86_64-unknown-linux-gnu:
   stage: artifacts
   image: nixos/nix:2.19.2
diff --git a/flake.nix b/flake.nix
index c30c9483..e7b8cdbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,6 +72,24 @@
             ++ lib.optionals
               (stdenv.buildPlatform.config != pkgs.stdenv.hostPlatform.config)
               ["-l" "c"]
+            ++ lib.optionals
+              # This check has to match the one [here][0]. We only need to set
+              # these flags when using a different linker. Don't ask me why,
+              # though, because I don't know. All I know is it breaks otherwise.
+              #
+              # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
+              (
+                pkgs.stdenv.hostPlatform.isAarch64
+                  && pkgs.stdenv.hostPlatform.isStatic
+                  && !pkgs.stdenv.isDarwin
+                  && !pkgs.stdenv.cc.bintools.isLLVM
+              )
+              [
+                "-l"
+                "stdc++"
+                "-L"
+                "${stdenv.cc.cc.lib}/${stdenv.hostPlatform.config}/lib"
+              ]
           );
       }
 
@@ -178,6 +196,7 @@
           })
           [
             "x86_64-unknown-linux-musl"
+            "aarch64-unknown-linux-musl"
           ]
       );
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 9a21cdb4..8ef64c92 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -18,4 +18,5 @@ components = [
 targets = [
     "x86_64-unknown-linux-gnu",
     "x86_64-unknown-linux-musl",
+    "aarch64-unknown-linux-musl",
 ]