Skip to content

Commit

Permalink
Removed deprecated workaround for dockercross/arm
Browse files Browse the repository at this point in the history
  • Loading branch information
dominicletz committed Dec 5, 2023
1 parent 91feac9 commit 977d46b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 1 addition & 5 deletions lib/mix/tasks/android_beam.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ RUN ARCH="android-<%= @arch.id %> -D__ANDROID_API__=<%= @arch.abi %>" ./install_
# Fetching OTP
COPY _build/otp otp

<%= if @arch.id == "arm" do %>
ENV LIBS -L$NDK_ROOT/lib64/clang/12.0.5/lib/linux/ /usr/local/openssl/lib/libcrypto.a -lclang_rt.builtins-arm-android
<% else %>
ENV LIBS /usr/local/openssl/lib/libcrypto.a
<% end %>

# We need -z global for liberlang.so because:
# https://android-ndk.narkive.com/iNWj05IV/weak-symbol-linking-when-loading-dynamic-libraries
Expand All @@ -45,7 +41,7 @@ config = "--with-ssl=/usr/local/openssl/ --disable-dynamic-ssl-lib --without-jav
# config = if @arch.id == "x86_64", do: "--disable-jit #{config}", else: config
config = "--disable-jit #{config}"
%>
RUN ./otp_build configure <%= config %>
RUN ./otp_build setup <%= config %> || bash -c 'cat erts/config.log && exit 1'
RUN ./otp_build boot -a

# Build run #2, now creating the arm binaries, appliying the install flags only here...
Expand Down
4 changes: 1 addition & 3 deletions lib/runtimes.ex
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ defmodule Runtimes do
File.mkdir_p!("_build")

Runtimes.run(
"git clone #{Runtimes.otp_source()} _build/otp && cd _build/otp && git checkout #{
Runtimes.otp_tag()
}"
"git clone #{Runtimes.otp_source()} _build/otp && cd _build/otp && git checkout #{Runtimes.otp_tag()}"
)
end
end
Expand Down

0 comments on commit 977d46b

Please sign in to comment.