mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-04-12 16:50:29 +02:00
android-arm: Update toolchain and provide Toolchain.cmake.
This commit is contained in:
parent
8876244731
commit
f3b2cbb199
4
Makefile
4
Makefile
@ -1,8 +1,8 @@
|
|||||||
DOCKER = docker
|
DOCKER = docker
|
||||||
IMAGE = thewtex/cross-compiler
|
IMAGE = thewtex/cross-compiler
|
||||||
|
|
||||||
android-arm:
|
android-arm: base android-arm/Dockerfile
|
||||||
$(DOCKER) build -t $(IMAGE)-android-arm linux-arm
|
$(DOCKER) build -t $(IMAGE)-android-arm android-arm
|
||||||
|
|
||||||
darwin-x64:
|
darwin-x64:
|
||||||
$(DOCKER) build -t $(IMAGE)-darwin-x64 darwin-x64
|
$(DOCKER) build -t $(IMAGE)-darwin-x64 darwin-x64
|
||||||
|
@ -1,26 +1,29 @@
|
|||||||
FROM steeve/cross-compiler:base
|
FROM thewtex/cross-compiler-base
|
||||||
MAINTAINER Steeve Morin "steeve.morin@gmail.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y --force-yes install \
|
# The cross-compiling emulator
|
||||||
bash \
|
RUN apt-get update && apt-get install -y \
|
||||||
curl \
|
qemu-user \
|
||||||
pkg-config \
|
qemu-user-static
|
||||||
build-essential \
|
|
||||||
file \
|
|
||||||
tar xz-utils bzip2 gzip sed
|
|
||||||
|
|
||||||
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 PATH ${PATH}:${CROSS_ROOT}/bin
|
|
||||||
ENV LD_LIBRARY_PATH ${CROSS_ROOT}/lib:${LD_LIBRARY_PATH}
|
|
||||||
|
|
||||||
|
ENV ANDROID_NDK_REVISION 10e
|
||||||
RUN mkdir -p /build && \
|
RUN mkdir -p /build && \
|
||||||
cd /build && \
|
cd /build && \
|
||||||
curl -L http://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86_64.tar.bz2 | tar xvj && \
|
curl -O http://dl.google.com/android/ndk/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \
|
||||||
cd /build/android-ndk-r10b && \
|
chmod +x ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \
|
||||||
/bin/bash ./build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=${CROSS_ROOT} && \
|
./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.bin && \
|
||||||
|
cd /build/android-ndk-r${ANDROID_NDK_REVISION} && \
|
||||||
|
/bin/bash ./build/tools/make-standalone-toolchain.sh \
|
||||||
|
--arch=arm \
|
||||||
|
--system=linux-x86_64 \
|
||||||
|
--ndk-dir=/build/android-ndk-r${ANDROID_NDK_REVISION} \
|
||||||
|
--platform=android-14 \
|
||||||
|
--install-dir=${CROSS_ROOT} && \
|
||||||
cd / && \
|
cd / && \
|
||||||
rm -rf /build
|
rm -rf /build
|
||||||
|
|
||||||
RUN cd ${CROSS_ROOT}/bin && \
|
COPY Toolchain.cmake /${CROSS_ROOT}/
|
||||||
ln -s ${CROSS_TRIPLE}-gcc ${CROSS_TRIPLE}-cc
|
ENV CMAKE_TOOLCHAIN_FILE /${CROSS_ROOT}/Toolchain.cmake
|
||||||
|
15
android-arm/Toolchain.cmake
Normal file
15
android-arm/Toolchain.cmake
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
set(CMAKE_SYSTEM_NAME Android)
|
||||||
|
set(CMAKE_SYSTEM_VERSION 1)
|
||||||
|
|
||||||
|
set(cross_triple arm-linux-androideabi)
|
||||||
|
|
||||||
|
set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-gcc)
|
||||||
|
set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-g++)
|
||||||
|
|
||||||
|
set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple})
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||||
|
set(CMAKE_SYSROOT /usr/${cross_triple}/sysroot)
|
||||||
|
|
||||||
|
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
|
Loading…
x
Reference in New Issue
Block a user