From 19322baed21a8749bf212273b634d2a85cf07f77 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Wed, 25 Aug 2021 17:05:21 +0200 Subject: [PATCH] Move to llvm for NDK 23 --- android-arm/Dockerfile.in | 12 +++++------- android-arm64/Dockerfile.in | 12 +++++------- android-x86/Dockerfile | 12 +++++------- android-x86_64/Dockerfile | 12 +++++------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in index 45a1357..65b4d06 100644 --- a/android-arm/Dockerfile.in +++ b/android-arm/Dockerfile.in @@ -9,13 +9,11 @@ RUN apt-get update && apt-get install -y \ ENV CROSS_TRIPLE=arm-linux-androideabi ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ - AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ - LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ - FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran +ENV AS=${CROSS_ROOT}/bin/llvm-as \ + AR=${CROSS_ROOT}/bin/llvm-ar \ + CC=${CROSS_ROOT}/bin/clang \ + CXX=${CROSS_ROOT}/bin/clang++ \ + LD=${CROSS_ROOT}/bin/ld ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 diff --git a/android-arm64/Dockerfile.in b/android-arm64/Dockerfile.in index b4dffb6..6cbbedf 100644 --- a/android-arm64/Dockerfile.in +++ b/android-arm64/Dockerfile.in @@ -13,13 +13,11 @@ RUN apt-get update && apt-get install -y \ ENV CROSS_TRIPLE=aarch64-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ - AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ - LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ - FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran +ENV AS=${CROSS_ROOT}/bin/llvm-as \ + AR=${CROSS_ROOT}/bin/llvm-ar \ + CC=${CROSS_ROOT}/bin/clang \ + CXX=${CROSS_ROOT}/bin/clang++ \ + LD=${CROSS_ROOT}/bin/ld ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile index 42a9e8d..e4f31a7 100644 --- a/android-x86/Dockerfile +++ b/android-x86/Dockerfile @@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip ENV CROSS_TRIPLE=i686-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ - AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ - LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ - FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran +ENV AS=${CROSS_ROOT}/bin/llvm-as \ + AR=${CROSS_ROOT}/bin/llvm-ar \ + CC=${CROSS_ROOT}/bin/clang \ + CXX=${CROSS_ROOT}/bin/clang++ \ + LD=${CROSS_ROOT}/bin/ld ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 diff --git a/android-x86_64/Dockerfile b/android-x86_64/Dockerfile index 41236a6..0ac2690 100644 --- a/android-x86_64/Dockerfile +++ b/android-x86_64/Dockerfile @@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip ENV CROSS_TRIPLE=x86_64-linux-android ENV CROSS_ROOT=/usr/${CROSS_TRIPLE} -ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ - AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ - LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ - FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran +ENV AS=${CROSS_ROOT}/bin/llvm-as \ + AR=${CROSS_ROOT}/bin/llvm-ar \ + CC=${CROSS_ROOT}/bin/clang \ + CXX=${CROSS_ROOT}/bin/clang++ \ + LD=${CROSS_ROOT}/bin/ld ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23