monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 12:39:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2965

Browse source 
5388c81b Added using TOOLCHAIN_DIR varable on symlinking in android dockerfiles (damir)
This commit is contained in:
Riccardo Spagni 2018-01-02 00:31:15 +02:00
commit d7df56341e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/build_scripts/android32.Dockerfile
View file

@ -80,7 +80,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \
&& CC=clang CXX=clang++ ./configure --host=arm-none-linux-gnueabi \ && CC=clang CXX=clang++ ./configure --host=arm-none-linux-gnueabi \
&& make && 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 \ RUN git clone https://github.com/monero-project/monero.git \
&& cd monero \ && cd monero \

2
utils/build_scripts/android64.Dockerfile
View file

@ -79,7 +79,7 @@ RUN git clone https://github.com/zeromq/zeromq4-1.git \
&& CC=clang CXX=clang++ ./configure --host=aarch64-linux-android \ && CC=clang CXX=clang++ ./configure --host=aarch64-linux-android \
&& make && 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 \ RUN git clone https://github.com/monero-project/monero.git \
&& cd monero \ && cd monero \