Skip to content

Commit

Permalink
Clean rebuild today
Browse files Browse the repository at this point in the history
  • Loading branch information
dominicletz committed Sep 9, 2021
1 parent 4767059 commit b768cbc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 3 additions & 5 deletions lib/beam.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@ ENV FC= CPP= LD= CC=clang AR=ar
# Setting up openssl
COPY install_openssl.sh /work/

<%= if @arch.id != "arm" do %>
# OpenSSL fails to detect this:
RUN cp ${NDK_ROOT}/bin/llvm-ar ${NDK_ROOT}/bin/<%= @arch.cpu %>-linux-android-ar
RUN cp ${NDK_ROOT}/bin/llvm-ranlib ${NDK_ROOT}/bin/<%= @arch.cpu %>-linux-android-ranlib
<% end %>
RUN cp ${NDK_ROOT}/bin/llvm-ar ${NDK_ROOT}/bin/<%= @arch.cpu %>-linux-<%= @arch.android_name %>-ar
RUN cp ${NDK_ROOT}/bin/llvm-ranlib ${NDK_ROOT}/bin/<%= @arch.cpu %>-linux-<%= @arch.android_name %>-ranlib

RUN ARCH="android-<%= @arch.id %> -D__ANDROID_API__=<%= @arch.abi %>" ./install_openssl.sh

# Fetching OTP
RUN git clone --depth 1 -b diode/beta https://github.com/diodechain/otp.git

<%= if @arch.id == "arm" do %>
ENV LIBS -L$NDK_ROOT/lib64/clang/11.0.5/lib/linux/ /usr/local/openssl/lib/libcrypto.a -lclang_rt.builtins-arm-android
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 %>
Expand Down
4 changes: 4 additions & 0 deletions lib/mix/tasks/package_nif.ex
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ defmodule Mix.Tasks.Package.Nif do
use Mix.Task
require EEx

def run([]) do

end

def run(args) do
{git, tag, tool} =
case args do
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule Runtime do
%{
"arm" => %{
id: "arm",
abi: 21,
abi: 23,
cpu: "arm",
pc: "arm-unknown",
android_name: "androideabi",
Expand Down

0 comments on commit b768cbc

Please sign in to comment.