mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Move to llvm for NDK 23
This commit is contained in:
parent
e05e6dd677
commit
a4576a5da4
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user