From 798ec2e3d469abfd180ee8b6debe7b66cf915467 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Mon, 10 May 2021 23:03:39 +0200
Subject: [PATCH] musl

---
 .circleci/config.yml        |  4 ++--
 .circleci/script/setup-musl | 12 ++++++++++++
 Dockerfile                  |  1 +
 script/compile              |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8a865241..6d772855 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -192,7 +192,7 @@ jobs:
           command: |
             sudo apt-get update
             sudo apt-get -y install gcc g++ zlib1g-dev
-            sudo .circleci/script/setup-musl
+            sudo -E script/setup-musl
       - run:
           name: Download GraalVM
           command: |
@@ -372,7 +372,7 @@ jobs:
           command: |
             sudo apt-get update
             sudo apt-get -y install gcc g++ zlib1g-dev
-            sudo -E .circleci/script/setup-musl
+            # sudo -E script/setup-musl
       - run:
           name: Download GraalVM
           command: |
diff --git a/.circleci/script/setup-musl b/.circleci/script/setup-musl
index 1dbddd5b..9a28a7f6 100755
--- a/.circleci/script/setup-musl
+++ b/.circleci/script/setup-musl
@@ -4,6 +4,18 @@
 # The one available in stable and testing are quite outdated and this ensures we get the latest improvements
 # This explictly installs musl from unstable and keeps the others at a higher priority
 
+if [ "$BABASHKA_STATIC" != "true" ]
+then
+    echo "BABASHKA_STATIC wasn't set, skipping musl installation."
+    exit 0
+fi
+
+if [ "$BABASHKA_ARCH" = "aarch64" ]
+then
+    echo "GraalVM only supports musl on x86_64"
+    exit 0
+fi
+
 cat >> /etc/apt/sources.list <<eof
 deb http://ftp.us.debian.org/debian unstable main non-free contrib
 deb http://non-us.debian.org/debian-non-us unstable/non-us main contrib non-free
diff --git a/Dockerfile b/Dockerfile
index db7ba15c..02f45e2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,6 +54,7 @@ ENV BABASHKA_STATIC=$BABASHKA_STATIC
 COPY . .
 RUN ./script/uberjar
 RUN ./script/compile
+RUN ./script/setup-musl
 
 FROM ubuntu:latest
 RUN apt-get update && apt-get install -y curl \
diff --git a/script/compile b/script/compile
index 84718ca0..9ada944f 100755
--- a/script/compile
+++ b/script/compile
@@ -75,7 +75,7 @@ args=( "-jar" "$BABASHKA_JAR"
 
 BABASHKA_STATIC=${BABASHKA_STATIC:-}
 
-if [ "$BABASHKA_STATIC" = "true" ]; then
+if [ "$BABASHKA_STATIC" = "true" ] & [ "$BABASHKA_ARCH" != "aarch64" ]; then
     args+=("--static" "--libc=musl"
            # see https://github.com/oracle/graal/issues/3398
            "-H:CCompilerOption=-Wl,-z,stack-size=2097152")