Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move to llvm for NDK 23

Browse Source
This commit is contained in:
Jonas Vautherin 2021-08-25 17:05:21 +02:00
parent e05e6dd677
commit a4576a5da4
4 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android-arm/Dockerfile.in
View File

@ -9,13 +9,11 @@ RUN apt-get update && apt-get install -y \
ENV CROSS_TRIPLE=arm-linux-androideabi ENV CROSS_TRIPLE=arm-linux-androideabi
ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/llvm-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/llvm-ar \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ CC=${CROSS_ROOT}/bin/clang \
CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ CXX=${CROSS_ROOT}/bin/clang++ \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ LD=${CROSS_ROOT}/bin/ld
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23 ENV ANDROID_NDK_API 23

12
android-arm64/Dockerfile.in
View File

@ -13,13 +13,11 @@ RUN apt-get update && apt-get install -y \
ENV CROSS_TRIPLE=aarch64-linux-android ENV CROSS_TRIPLE=aarch64-linux-android
ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/llvm-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/llvm-ar \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ CC=${CROSS_ROOT}/bin/clang \
CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ CXX=${CROSS_ROOT}/bin/clang++ \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ LD=${CROSS_ROOT}/bin/ld
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23 ENV ANDROID_NDK_API 23

12
android-x86/Dockerfile
View File

@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip
ENV CROSS_TRIPLE=i686-linux-android ENV CROSS_TRIPLE=i686-linux-android
ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/llvm-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/llvm-ar \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ CC=${CROSS_ROOT}/bin/clang \
CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ CXX=${CROSS_ROOT}/bin/clang++ \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ LD=${CROSS_ROOT}/bin/ld
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23 ENV ANDROID_NDK_API 23

12
android-x86_64/Dockerfile
View File

@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip
ENV CROSS_TRIPLE=x86_64-linux-android ENV CROSS_TRIPLE=x86_64-linux-android
ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ ENV AS=${CROSS_ROOT}/bin/llvm-as \
AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ AR=${CROSS_ROOT}/bin/llvm-ar \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ CC=${CROSS_ROOT}/bin/clang \
CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ CXX=${CROSS_ROOT}/bin/clang++ \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ LD=${CROSS_ROOT}/bin/ld
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23 ENV ANDROID_NDK_API 23