Remove mimalloc workaround (#4606)

- libatomic linking for armv6 has been fixed in purpleprotocol/mimalloc_rust@992c9da
dani-garcia · Jun 24, 2024 · 8e2a87f · 8e2a87f
1 parent 4233dbf
commit 8e2a87f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -67,8 +67,6 @@ WORKDIR /app
 
 # Environment variables for Cargo on Alpine based builds
 RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \
-    # To be able to build the armv6 image with mimalloc we need to tell the linker to also look for libatomic
-    if [[ "${TARGETARCH}${TARGETVARIANT}" == "armv6" ]] ; then echo "export RUSTFLAGS='-Clink-arg=-latomic'" >> /env-cargo ; fi && \
     # Output the current contents of the file
     cat /env-cargo
 

diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -133,8 +133,6 @@ RUN source /env-cargo && \
 {% elif base == "alpine" %}
 # Environment variables for Cargo on Alpine based builds
 RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \
-    # To be able to build the armv6 image with mimalloc we need to tell the linker to also look for libatomic
-    if [[ "${TARGETARCH}${TARGETVARIANT}" == "armv6" ]] ; then echo "export RUSTFLAGS='-Clink-arg=-latomic'" >> /env-cargo ; fi && \
     # Output the current contents of the file
     cat /env-cargo