diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-01-02 00:31:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-01-02 00:31:15 +0200 |
| commit | d7df56341e57a085c48c216255fd57f7328bfdad (patch) | |
| tree | 5706a44bbd8f16dbf5775c45de42f877723d0d59 | |
| parent | Merge pull request #2964 (diff) | |
| parent | Added using TOOLCHAIN_DIR varable on symlinking in android dockerfiles (diff) | |
| download | monero-d7df56341e57a085c48c216255fd57f7328bfdad.tar.xz | |
Merge pull request #2965
5388c81b Added using TOOLCHAIN_DIR varable on symlinking in android dockerfiles (damir)
| -rw-r--r-- | utils/build_scripts/android32.Dockerfile | 2 | ||||
| -rw-r--r-- | utils/build_scripts/android64.Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/build_scripts/android32.Dockerfile b/utils/build_scripts/android32.Dockerfile index 37d012202..20b846aa1 100644 --- a/utils/build_scripts/android32.Dockerfile +++ b/utils/build_scripts/android32.Dockerfile @@ -80,7 +80,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \ && CC=clang CXX=clang++ ./configure --host=arm-none-linux-gnueabi \ && make -RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/arm-linux-androideabi/lib/armv7-a +RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a ${TOOLCHAIN_DIR}/arm-linux-androideabi/lib/armv7-a RUN git clone https://github.com/monero-project/monero.git \ && cd monero \ diff --git a/utils/build_scripts/android64.Dockerfile b/utils/build_scripts/android64.Dockerfile index 70c3c2b41..83bcbad89 100644 --- a/utils/build_scripts/android64.Dockerfile +++ b/utils/build_scripts/android64.Dockerfile @@ -79,7 +79,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \ && CC=clang CXX=clang++ ./configure --host=aarch64-linux-android \ && make -RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/aarch64-linux-android/lib +RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a ${TOOLCHAIN_DIR}/aarch64-linux-android/lib RUN git clone https://github.com/monero-project/monero.git \ && cd monero \ |