Add missing CROSS_TRIPLE for linux-armv7 and linux-ppc64le.

This commit is contained in:
Matt McCormick 2015-05-25 22:01:03 -04:00
parent 6e545319f0
commit 58f007910a
2 changed files with 10 additions and 4 deletions

View File

@ -12,9 +12,12 @@ RUN apt-get update && apt-get install -y \
qemu-user \ qemu-user \
qemu-user-static qemu-user-static
ENV CROSS_TRIPLE arm-linux-gnueabihf
ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
WORKDIR /usr/src WORKDIR /usr/src
# Note: Toolchain file support is currently in debian Experimental: # Note: Toolchain file support is currently in debian Experimental:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
COPY Toolchain.cmake /usr/lib/arm-linux-gnueabihf/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/arm-linux-gnueabihf/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake

View File

@ -10,6 +10,9 @@ RUN apt-get update && apt-get install -y \
crossbuild-essential-ppc64el \ crossbuild-essential-ppc64el \
gfortran-powerpc64le-linux-gnu gfortran-powerpc64le-linux-gnu
ENV CROSS_TRIPLE powerpc64le-linux-gnu
ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get update && \ RUN apt-get update && \
@ -24,5 +27,5 @@ RUN apt-get update && \
# Note: Toolchain file support is currently in debian Experimental according to: # Note: Toolchain file support is currently in debian Experimental according to:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
# We can switch to that when it becomes stable. # We can switch to that when it becomes stable.
COPY Toolchain.cmake /usr/lib/powerpc64le-linux-gnu/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/powerpc64le-linux-gnu/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake