From 490a20138368db41489268fd9b0c1bee0bdd7043 Mon Sep 17 00:00:00 2001
From: Valdemar Erk <VER@nervesmartsystems.com>
Date: Wed, 13 Mar 2024 11:24:51 +0100
Subject: [PATCH] remove cargo-chef and link to libgcc on aarch64.

---
 Dockerfile | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 796b6a1..708f1a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # Rust syntax target, either x86_64-unknown-linux-musl, aarch64-unknown-linux-musl etc.
-ARG RUST_TARGET="aarch64-unknown-linux-musl"
+ARG RUST_TARGET="x86_64-unknown-linux-musl"
 # The crate features to build this with
 ARG FEATURES=""
 
-FROM --platform=$BUILDPLATFORM rustlang/rust:nightly AS chef
+FROM --platform=$BUILDPLATFORM rustlang/rust:nightly AS builder
 ARG RUST_TARGET
 ARG FEATURES
 
@@ -11,7 +11,7 @@ RUN <<EOT
     set -ex
     apt-get update
     apt-get upgrade
-    apt-get install --assume-yes musl-dev clang lld
+    apt-get install --assume-yes musl-dev clang lld libgcc-12-dev-arm64-cross
 EOT
 
 RUN <<-EOT bash
@@ -20,8 +20,6 @@ RUN <<-EOT bash
     rustup component add rust-src --toolchain "nightly"
 EOT
 
-RUN cargo install cargo-chef --locked
-
 COPY <<EOF /app/.cargo/config.toml
 [env]
 CC_aarch64-unknown-linux-musl = "clang -target aarch64-unknown-linux-musl -fuse-ld=lld"
@@ -34,6 +32,8 @@ linker = "clang"
 rustflags = [
           "-C", "link-args=-target aarch64-unknown-linux-musl -fuse-ld=lld",
           "-C", "strip=symbols",
+          # aarch64 has to link libgcc
+          "-C", "link-arg=-lgcc",
 ]
 
 [target.x86_64-unknown-linux-musl]
@@ -49,21 +49,6 @@ EOF
 
 WORKDIR /app
 
-FROM chef AS planner
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM chef AS builder
-COPY --from=planner /app/recipe.json recipe.json
-RUN <<-EOF bash
-    set -ex
-    if test "$FEATURES" = ""; then
-      cargo chef cook --target "$RUST_TARGET" --release --recipe-path recipe.json
-    else
-      cargo chef cook --target "$RUST_TARGET" --features="$FEATURES" --release --recipe-path recipe.json
-    fi
-EOF
-
 COPY . .
 
 RUN <<-EOF bash
@@ -76,7 +61,6 @@ RUN <<-EOF bash
     cp target/$RUST_TARGET/release/twilight-http-proxy /twilight-http-proxy
 EOF
 
-
 FROM scratch
 
 COPY --from=builder /twilight-http-proxy /twilight-http-proxy